kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Previous comit was wrong and add memory leak.

Browse Source 
This comit fix regression come from previous comit and improve how diagram folio list is drawed 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3062 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-05-10 17:13:09 +00:00
parent dde2d3716f
commit 4fe34f8956
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sources/diagramfoliolist.cpp
View File

@@ -34,17 +34,6 @@ DiagramFolioList::DiagramFolioList( QETProject *project, QObject *parent) : Diag
} }
else else
id = 0; id = 0;
qreal width = border_and_titleblock.columnsTotalWidth();
qreal height = border_and_titleblock.rowsTotalHeight();
//top left corner of drawable area
qreal x0 = border_and_titleblock.rowsHeaderWidth();
qreal y0 = border_and_titleblock.columnsHeaderHeight();
QRectF row_RectBorder(x0, y0, width, height);
sheetRectangle = row_RectBorder;
buildGrid(row_RectBorder,30,2,colWidths);
} }
/** /**
@@ -89,19 +78,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r)
qreal y0 = border_and_titleblock.columnsHeaderHeight(); qreal y0 = border_and_titleblock.columnsHeaderHeight();
QRectF row_RectBorder(x0, y0, width, height); QRectF row_RectBorder(x0, y0, width, height);
// If the sheet size has changed since last paint, then clear the scene and re-draw the grid. buildGrid(p, row_RectBorder,30,2,colWidths);
if (sheetRectangle != row_RectBorder) {
sheetRectangle = row_RectBorder;
foreach(QGraphicsItem *qgi, items()) {
removeItem(qgi);
qgiManager().release(qgi);
}
qDeleteAll (list_lines_);
list_lines_.clear();
qDeleteAll (list_rectangles_);
list_rectangles_.clear();
buildGrid(row_RectBorder,30,2,colWidths);
}
x0 = list_rectangles_[0] -> topLeft().x(); x0 = list_rectangles_[0] -> topLeft().x();
y0 = list_rectangles_[0] -> topLeft().y(); y0 = list_rectangles_[0] -> topLeft().y();
@@ -197,8 +174,13 @@ void DiagramFolioList::fillRow(QPainter *qp, const QRectF &row_rect, QString aut
qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, date); qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, date);
} }
void DiagramFolioList::buildGrid(const QRectF &rect, int rows, int tables, qreal colWidths[]) void DiagramFolioList::buildGrid(QPainter *qp, const QRectF &rect, int rows, int tables, qreal colWidths[])
{ {
qDeleteAll (list_lines_);
list_lines_.clear();
qDeleteAll (list_rectangles_);
list_rectangles_.clear();
qreal sum = 0; qreal sum = 0;
for (int i = 0; i < 4; i++ ) for (int i = 0; i < 4; i++ )
sum += colWidths[i]; sum += colWidths[i];
@@ -217,16 +199,16 @@ void DiagramFolioList::buildGrid(const QRectF &rect, int rows, int tables, qreal
for (int i = 0; i < tables; ++i) { for (int i = 0; i < tables; ++i) {
QRectF *tableRect = new QRectF(x0, y0, tableWidth, rect.height() - 2*tablesSpacing); QRectF *tableRect = new QRectF(x0, y0, tableWidth, rect.height() - 2*tablesSpacing);
addRect(*tableRect); qp->drawRect(*tableRect);
list_rectangles_.push_back(tableRect); list_rectangles_.push_back(tableRect);
for (int j = 1; j < rows; ++j) { for (int j = 1; j < rows; ++j) {
QLineF *line = new QLineF(x0, y0 + j*rowHeight, x0 + tableWidth,y0 + j*rowHeight); QLineF *line = new QLineF(x0, y0 + j*rowHeight, x0 + tableWidth,y0 + j*rowHeight);
addLine(*line); qp->drawLine(*line);
list_lines_.push_back(line); list_lines_.push_back(line);
} }
for (int j = 0; j < cols-1; ++j) { for (int j = 0; j < cols-1; ++j) {
QLineF *line = new QLineF(x0 + colWidths[j]*tableWidth, y0, x0 + colWidths[j]*tableWidth,y0 + rows*rowHeight); QLineF *line = new QLineF(x0 + colWidths[j]*tableWidth, y0, x0 + colWidths[j]*tableWidth,y0 + rows*rowHeight);
addLine(*line); qp->drawLine(*line);
list_lines_.push_back(line); list_lines_.push_back(line);
x0 += colWidths[j]*tableWidth; x0 += colWidths[j]*tableWidth;
} }

2
sources/diagramfoliolist.h
View File

@@ -38,7 +38,7 @@ class DiagramFolioList : public Diagram
private: private:
void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString); void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString);
void buildGrid(const QRectF &, int, int, qreal[]); void buildGrid(QPainter *, const QRectF &, int, int, qreal[]);
void fillHeader(QPainter *, const QRectF &); void fillHeader(QPainter *, const QRectF &);