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

Simplification du code gerant la mise a jour du sceneRect en cas de modification de la bordure du schema

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@142 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-09-28 21:02:53 +00:00
parent 9bdbf3aea5
commit d9d966e4e9
5 changed files with 25 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
borderinset.cpp
View File

@@ -33,7 +33,9 @@ BorderInset::~BorderInset() {
*/
void BorderInset::updateRectangles() {
// rectangle delimitant le schema
QRectF previous_border = border;
border = QRectF(0, 0, nb_columns * columns_width, columns_height);
if (border != previous_border) emit(borderChanged(previous_border, border));
// rectangles relatifs au cartouche
inset = QRectF(border.bottomLeft().x(), border.bottomLeft().y(), inset_width, inset_height);

9
borderinset.h
View File

@@ -89,6 +89,15 @@ class BorderInset : public QObject {
private:
void updateRectangles();
// signaux
signals:
/**
Signal emis lorsque la bordure change
@param old_border Ancienne bordure
@param new_border Nouvelle bordure
*/
void borderChanged(QRectF old_border, QRectF new_border);
// attributs
private:
// informations du cartouche

54
diagramview.cpp
View File

@@ -28,6 +28,7 @@ void DiagramView::initialise() {
setAlignment(Qt::AlignLeft | Qt::AlignTop);
adjustSceneRect();
connect(scene, SIGNAL(selectionEmptinessChanged()), this, SLOT(slot_selectionChanged()));
connect(&(scene -> border_and_inset), SIGNAL(borderChanged(QRectF, QRectF)), this, SLOT(adjustSceneRect()));
}
/**
@@ -523,14 +524,7 @@ bool DiagramView::hasSelectedItems() {
Ajoute une colonne au schema.
*/
void DiagramView::addColumn() {
// ajoute la colonne
scene -> border_and_inset.addColumn();
// met a jour la zone affichee par la vue
adjustSceneRect();
// rafraichit la vue
scene -> update(sceneRect());
}
/**
@@ -538,52 +532,22 @@ void DiagramView::addColumn() {
*/
void DiagramView::removeColumn() {
scene -> border_and_inset.removeColumn();
// met a jour la zone affichee par la vue
QRectF old_sr = sceneRect();
adjustSceneRect();
// rafraichit la vue
scene -> update(old_sr);
}
/**
Agrandit le schema en hauteur
*/
void DiagramView::expand() {
adjustHeight(20.0);
qreal new_height = scene -> border_and_inset.columnsHeight() + 20.0;
scene -> border_and_inset.setColumnsHeight(new_height);
}
/**
Retrecit le schema en hauteur
*/
void DiagramView::shrink() {
adjustHeight(-20.0);
}
/**
Change la hauteur du schema
@param height_change Le changement de hauteur ; exemple : -5.0 retrecit
le cadre de 5 pixels
*/
void DiagramView::adjustHeight(qreal height_change) {
// reference vers le "border and inset" du schema
BorderInset &border = scene -> border_and_inset;
// calcule la nouvelle hauteur des colonnes
qreal new_height = border.columnsHeight() + height_change;
if (new_height <= border.minColumnsHeight()) return;
// applique la reduction
border.setColumnsHeight(new_height);
// met a jour la zone affichee par la vue
QRectF old_sr = sceneRect();
adjustSceneRect();
QRectF new_sr = sceneRect();
// rafraichit la vue
scene -> update(height_change < 0 ? old_sr : new_sr);
qreal new_height = scene -> border_and_inset.columnsHeight() - 20.0;
scene -> border_and_inset.setColumnsHeight(new_height);
}
/**
@@ -592,6 +556,8 @@ void DiagramView::adjustHeight(qreal height_change) {
lui-meme.
*/
void DiagramView::adjustSceneRect() {
QRectF old_scene_rect = sceneRect();
// rectangle delimitant l'ensemble des elements
QRectF elements_bounding_rect = scene -> itemsBoundingRect();
@@ -599,7 +565,11 @@ void DiagramView::adjustSceneRect() {
QRectF border_bounding_rect = scene -> border().adjusted(-MARGIN, -MARGIN, MARGIN, MARGIN);
// ajuste la sceneRect
setSceneRect(elements_bounding_rect.united(border_bounding_rect));
QRectF new_scene_rect = elements_bounding_rect.united(border_bounding_rect);
setSceneRect(new_scene_rect);
// met a jour la scene
scene -> update(old_scene_rect.united(new_scene_rect));
}
void DiagramView::adjustGridToZoom() {

3
diagramview.h
View File

@@ -34,8 +34,6 @@ class DiagramView : public QGraphicsView {
void dialogPrint();
void addColumn();
void removeColumn();
void adjustHeight(qreal);
void adjustSceneRect();
void expand();
void shrink();
Diagram *diagram() { return(scene); }
@@ -71,6 +69,7 @@ class DiagramView : public QGraphicsView {
void couper();
void copier();
void coller();
void adjustSceneRect();
private slots:
void slot_selectionChanged();

2
exportdialog.cpp
View File

@@ -378,6 +378,6 @@ void ExportDialog::slot_refreshPreview() {
// ajoute le nouvel apercu
QGraphicsPixmapItem *qgpi = new QGraphicsPixmapItem(QPixmap::fromImage(preview_image));
preview_scene -> addItem(qgpi);
preview_scene -> setSceneRect(QRectF(0.0, 0.0, preview_image.width() + 15.0, preview_image.height() + 15.0));
preview_scene -> setSceneRect(QRectF(0.0, 0.0, preview_image.width(), preview_image.height()));
}