Amelioration des methodes de selection dans l'editeur d'element.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@593 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2009-04-18 14:21:08 +00:00
parent c3769490f6
commit 4fea5dee44
2 changed files with 12 additions and 1 deletions

View File

@@ -596,7 +596,8 @@ QRectF ElementScene::borderRect() const {
"bounding rect" de l'element "bounding rect" de l'element
*/ */
QRectF ElementScene::sceneContent() const { QRectF ElementScene::sceneContent() const {
return(itemsBoundingRect().unite(borderRect())); qreal adjustment = 5.0;
return(itemsBoundingRect().unite(borderRect()).adjusted(-adjustment, -adjustment, adjustment, adjustment));
} }
/** /**
@@ -684,7 +685,10 @@ void ElementScene::paste() {
Selectionne tout Selectionne tout
*/ */
void ElementScene::slot_selectAll() { void ElementScene::slot_selectAll() {
blockSignals(true);
foreach(QGraphicsItem *qgi, items()) qgi -> setSelected(true); foreach(QGraphicsItem *qgi, items()) qgi -> setSelected(true);
blockSignals(false);
emit(selectionChanged());
} }
/** /**
@@ -698,7 +702,10 @@ void ElementScene::slot_deselectAll() {
Inverse la selection Inverse la selection
*/ */
void ElementScene::slot_invertSelection() { void ElementScene::slot_invertSelection() {
blockSignals(true);
foreach(QGraphicsItem *qgi, items()) qgi -> setSelected(!qgi -> isSelected()); foreach(QGraphicsItem *qgi, items()) qgi -> setSelected(!qgi -> isSelected());
blockSignals(false);
emit(selectionChanged());
} }
/** /**

View File

@@ -33,6 +33,7 @@ ElementView::ElementView(ElementScene *scene, QWidget *parent) :
setResizeAnchor(QGraphicsView::AnchorUnderMouse); setResizeAnchor(QGraphicsView::AnchorUnderMouse);
zoomReset(); zoomReset();
connect(scene_, SIGNAL(pasteAreaDefined(const QRectF &)), this, SLOT(pasteAreaDefined(const QRectF &))); connect(scene_, SIGNAL(pasteAreaDefined(const QRectF &)), this, SLOT(pasteAreaDefined(const QRectF &)));
connect(scene_, SIGNAL(partsAdded()), this, SLOT(adjustSceneRect()));
} }
/// Destructeur /// Destructeur
@@ -90,6 +91,7 @@ bool ElementView::event(QEvent *e) {
Agrandit le schema (+33% = inverse des -25 % de zoomMoins()) Agrandit le schema (+33% = inverse des -25 % de zoomMoins())
*/ */
void ElementView::zoomIn() { void ElementView::zoomIn() {
adjustSceneRect();
scale(4.0/3.0, 4.0/3.0); scale(4.0/3.0, 4.0/3.0);
} }
@@ -97,6 +99,7 @@ void ElementView::zoomIn() {
Retrecit le schema (-25% = inverse des +33 % de zoomPlus()) Retrecit le schema (-25% = inverse des +33 % de zoomPlus())
*/ */
void ElementView::zoomOut() { void ElementView::zoomOut() {
adjustSceneRect();
scale(0.75, 0.75); scale(0.75, 0.75);
} }
@@ -114,6 +117,7 @@ void ElementView::zoomFit() {
Reinitialise le zoom Reinitialise le zoom
*/ */
void ElementView::zoomReset() { void ElementView::zoomReset() {
adjustSceneRect();
resetMatrix(); resetMatrix();
scale(4.0, 4.0); scale(4.0, 4.0);
} }