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

Simplification au niveau des methodes selectionChanged

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@245 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-12-22 16:07:14 +00:00
parent 492751508b
commit e3bd116fd7
5 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
diagramview.cpp
View File

@@ -53,7 +53,7 @@ DiagramView::DiagramView(QWidget *parent) : QGraphicsView(parent), is_adding_tex
paste_here = new QAction(QIcon(":/ico/paste.png"), tr("Coller ici"), this); paste_here = new QAction(QIcon(":/ico/paste.png"), tr("Coller ici"), this);
connect(paste_here, SIGNAL(triggered()), this, SLOT(pasteHere())); connect(paste_here, SIGNAL(triggered()), this, SLOT(pasteHere()));
connect(scene, SIGNAL(selectionEmptinessChanged()), this, SLOT(slot_selectionChanged())); connect(scene, SIGNAL(selectionEmptinessChanged()), this, SIGNAL(selectionChanged()));
connect(&(scene -> border_and_inset), SIGNAL(borderChanged(QRectF, QRectF)), this, SLOT(adjustSceneRect())); connect(&(scene -> border_and_inset), SIGNAL(borderChanged(QRectF, QRectF)), this, SLOT(adjustSceneRect()));
connect(&(scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(updateWindowTitle())); connect(&(scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(updateWindowTitle()));
} }
@@ -400,13 +400,6 @@ bool DiagramView::open(QString n_fichier, int *erreur) {
} }
} }
/**
Slot appele lorsque la selection change.
*/
void DiagramView::slot_selectionChanged() {
emit(selectionChanged());
}
/** /**
Gere la fermeture du schema. Gere la fermeture du schema.
@param event Le QCloseEvent decrivant l'evenement @param event Le QCloseEvent decrivant l'evenement

1
diagramview.h
View File

@@ -113,7 +113,6 @@ class DiagramView : public QGraphicsView {
void editDefaultConductorProperties(); void editDefaultConductorProperties();
private slots: private slots:
void slot_selectionChanged();
void adjustGridToZoom(); void adjustGridToZoom();
}; };
#endif #endif

11
editor/elementscene.cpp
View File

@@ -48,7 +48,6 @@ ElementScene::ElementScene(QETElementEditor *editor, QObject *parent) :
{ {
current_polygon = NULL; current_polygon = NULL;
undo_stack.setClean(); undo_stack.setClean();
connect(this, SIGNAL(changed(const QList<QRectF> &)), this, SLOT(slot_checkSelectionChanged()));
} }
/// Destructeur /// Destructeur
@@ -497,16 +496,6 @@ QGIManager &ElementScene::qgiManager() {
return(qgi_manager); return(qgi_manager);
} }
/**
Detecte les changements de selection
*/
void ElementScene::slot_checkSelectionChanged() {
static QList<QGraphicsItem *> cache_selecteditems = QList<QGraphicsItem *>();
QList<QGraphicsItem *> selecteditems = selectedItems();
if (cache_selecteditems != selecteditems) emit(selectionChanged());
cache_selecteditems = selecteditems;
}
/** /**
Selectionne tout Selectionne tout
*/ */

3
editor/elementscene.h
View File

@@ -121,7 +121,6 @@ class ElementScene : public QGraphicsScene {
void slot_addArc(); void slot_addArc();
void slot_addTerminal(); void slot_addTerminal();
void slot_addTextField(); void slot_addTextField();
void slot_checkSelectionChanged();
void slot_selectAll(); void slot_selectAll();
void slot_deselectAll(); void slot_deselectAll();
void slot_invertSelection(); void slot_invertSelection();
@@ -135,8 +134,6 @@ class ElementScene : public QGraphicsScene {
void slot_sendBackward(); void slot_sendBackward();
signals: signals:
/// Signal emis lorsque la selection change
void selectionChanged();
/** /**
Signal emis lorsque la scene exige que l'editeur d'element repasse Signal emis lorsque la scene exige que l'editeur d'element repasse
en mode normal en mode normal

12
editor/qetelementeditor.cpp
View File

@@ -381,14 +381,17 @@ void QETElementEditor::slot_updateInformations() {
// enleve les widgets deja presents // enleve les widgets deja presents
QLayoutItem *qli; QLayoutItem *qli;
while ((qli = layout -> takeAt(0)) != 0) { while ((qli = layout -> takeAt(0)) != 0) {
if (qli -> widget()) { if (QWidget *w = qli -> widget()) {
layout -> removeWidget(qli -> widget()); layout -> removeWidget(w);
qli -> widget() -> setParent(0); w -> setParent(0);
w -> hide();
} }
} }
if (selected_parts.size() == 1) { if (selected_parts.size() == 1) {
// recupere le premier CustomElementPart et en ajoute le widget d'edition // recupere le premier CustomElementPart et en ajoute le widget d'edition
layout -> addWidget(selected_parts.first() -> elementInformations()); QWidget *edit_widget = selected_parts.first() -> elementInformations();
layout -> addWidget(edit_widget);
edit_widget -> show();
} else { } else {
default_informations -> setText( default_informations -> setText(
selected_parts.size() ? selected_parts.size() ?
@@ -396,6 +399,7 @@ void QETElementEditor::slot_updateInformations() {
tr("Aucune partie s\351lectionn\351e.") tr("Aucune partie s\351lectionn\351e.")
); );
layout -> addWidget(default_informations); layout -> addWidget(default_informations);
default_informations -> show();
} }
} }