refactor[diagram editor] close bug.

Close bug report #324
https://qelectrotech.org/bugtracker/view.php?id=324

See commit #1b671990ee8435616725afdffba438fdfcd18069

sources/TerminalStrip/ui/terminalstripeditor.cpp

@@ -57,21 +57,9 @@ TerminalStripEditor::TerminalStripEditor(QETProject *project, QWidget *parent) :
 	{
 		if (m_model->columnTypeForIndex(index) == TerminalStripModel::XRef)
 		{
-			auto mrtd = m_model->modelRealTerminalDataForIndex(index);
+			const auto mrtd = m_model->modelRealTerminalDataForIndex(index);
-			if (mrtd.element_)
+			if (mrtd.element_) {
-			{
+				QetGraphicsItem::showItem(mrtd.element_);
-				auto elmt = mrtd.element_;
-				auto diagram = elmt->diagram();
-				if (diagram)
-				{
-					diagram->showMe();
-					if (diagram->views().size())
-					{
-						auto fit_view = elmt->sceneBoundingRect();
-						fit_view.adjust(-200,-200,200,200);
-						diagram->views().at(0)->fitInView(fit_view, Qt::KeepAspectRatioByExpanding);
-					}
-				}
 			}
 		}
 	});

sources/qetgraphicsitem/crossrefitem.cpp

@@ -320,24 +320,7 @@ void CrossRefItem::paint(
 void CrossRefItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
 	event->accept();
-	if (m_hovered_contact && m_hovered_contact->scene())
+	QetGraphicsItem::showItem(m_hovered_contact);
-	{
-			//Show and select the linked slave element
-		if (scene() != m_hovered_contact->scene())
-		{
-			m_hovered_contact->diagram()->showMe();
-		}
-		m_hovered_contact->setSelected(true);
-
-			//Zoom to the linked slave element
-		foreach(QGraphicsView *view,
-				m_hovered_contact->diagram()->views())
-		{
-			QRectF fit = m_hovered_contact->sceneBoundingRect();
-			fit.adjust(-200, -200, 200, 200);
-			view->fitInView(fit, Qt::KeepAspectRatioByExpanding);
-		}
-	}
 }
 
 /**

sources/qetgraphicsitem/dynamicelementtextitem.cpp

@@ -1278,17 +1278,7 @@ void DynamicElementTextItem::zoomToLinkedElement()
 		setSelected(false);
 		ungrabMouse();
 
-		if(scene() != zoomed_element->scene())
+		QetGraphicsItem::showItem(zoomed_element);
-			zoomed_element->diagram()->showMe();
-		zoomed_element->setSelected(true);
-		
-			//Zoom to the element
-		for(QGraphicsView *view : zoomed_element->scene()->views())
-		{
-			QRectF fit = zoomed_element->sceneBoundingRect();
-			fit.adjust(-200, -200, 200, 200);
-			view->fitInView(fit, Qt::KeepAspectRatioByExpanding);
-		}
 	}
 }
 

sources/qetgraphicsitem/slaveelement.cpp

@@ -18,8 +18,6 @@
 #include "slaveelement.h"
 
 #include "../diagram.h"
-#include "../diagramposition.h"
-#include "../qetapp.h"
 #include "dynamicelementtextitem.h"
 
 /**
@@ -33,9 +31,7 @@ SlaveElement::SlaveElement(const ElementsLocation &location,
 			   QGraphicsItem *qgi,
 			   int *state) :
 	Element(location, qgi, state, Element::Slave)
-{
+{}
-	m_xref_item = nullptr;
-}
 
 /**
 	@brief SlaveElement::~SlaveElement

sources/qetgraphicsitem/slaveelement.h

@@ -18,7 +18,6 @@
 #ifndef SLAVEELEMENT_H
 #define SLAVEELEMENT_H
 
-#include "../properties/xrefproperties.h"
 #include "element.h"
 
 class SlaveElement : public Element
@@ -33,9 +32,6 @@ class SlaveElement : public Element
 		void linkToElement(Element *elmt) override;
 		void unlinkAllElements() override;
 		void unlinkElement(Element *elmt) override;
-	
-	private:
-		QGraphicsTextItem *m_xref_item;
 };
 
 #endif // SLAVEELEMENT_H

sources/ui/configpage/generalconfigurationpage.cpp

@@ -83,7 +83,6 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) :
 	ui->m_use_gesture_trackpad->setChecked(settings.value("diagramview/gestures", false).toBool());
 	ui->m_save_label_paste->setChecked(settings.value("diagramcommands/erase-label-on-copy", true).toBool());
 	ui->m_use_folio_label->setChecked(settings.value("genericpanel/folio", true).toBool());
-	ui->m_export_terminal->setChecked(settings.value("nomenclature-exportlist", true).toBool());
 	ui->m_border_0->setChecked(settings.value("border-columns_0", false).toBool());
 	ui->m_autosave_sb->setValue(settings.value("diagrameditor/autosave-interval", 0).toInt());
 	
@@ -224,9 +223,6 @@ void GeneralConfigurationPage::applyConf()
 		//GENERIC PANEL
 	settings.setValue("genericpanel/folio",ui->m_use_folio_label->isChecked());
 
-		//NOMENCLATURE
-	settings.setValue("nomenclature/terminal-exportlist",ui->m_export_terminal->isChecked());
-
 
 		//DIAGRAM EDITOR
 	QString view_mode = ui->m_use_tab_mode_rb->isChecked() ? "tabbed" : "windowed";

sources/ui/configpage/generalconfigurationpage.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>872</width>
+    <width>935</width>
     <height>556</height>
    </rect>
   </property>
@@ -128,41 +128,21 @@
        <string>Projets</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="4" column="1">
+       <item row="1" column="0">
-        <spacer name="horizontalSpacer">
+        <widget class="QCheckBox" name="m_use_folio_label">
-         <property name="orientation">
+         <property name="text">
-          <enum>Qt::Horizontal</enum>
+          <string>Utiliser les numéros de folio à la place de leur position dans le projet</string>
          </property>
-         <property name="sizeHint" stdset="0">
+        </widget>
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
        </item>
-       <item row="4" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech)</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
+       <item row="3" column="2">
-        <widget class="QCheckBox" name="m_save_label_paste">
-         <property name="text">
-          <string>Ne pas conserver les labels des éléments lors des copier coller</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="m_border_0">
-         <property name="text">
-          <string extracomment="Choix de l'increment de depart 1 ou 0">Numéroter les colonnes de cartouche à partir de 0 (1 sinon)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="2">
         <widget class="QSpinBox" name="m_autosave_sb">
          <property name="frame">
           <bool>true</bool>
@@ -184,14 +164,14 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="0" column="0">
-        <widget class="QCheckBox" name="m_use_folio_label">
+        <widget class="QCheckBox" name="m_save_label_paste">
          <property name="text">
-          <string>Utiliser les numéros de folio à la place de leur position dans le projet</string>
+          <string>Ne pas conserver les labels des éléments lors des copier coller</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="4" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -204,10 +184,23 @@
          </property>
         </spacer>
        </item>
+       <item row="3" column="1">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="2" column="0">
-        <widget class="QCheckBox" name="m_export_terminal">
+        <widget class="QCheckBox" name="m_border_0">
          <property name="text">
-          <string>Exporter les bornes dans la nomenclature</string>
+          <string extracomment="Choix de l'increment de depart 1 ou 0">Numéroter les colonnes de cartouche à partir de 0 (1 sinon)</string>
          </property>
         </widget>
        </item>
@@ -1090,7 +1083,6 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
   <tabstop>m_use_tab_mode_rb</tabstop>
   <tabstop>m_save_label_paste</tabstop>
   <tabstop>m_use_folio_label</tabstop>
-  <tabstop>m_export_terminal</tabstop>
   <tabstop>m_border_0</tabstop>
   <tabstop>m_autosave_sb</tabstop>
   <tabstop>m_common_elmt_path_cb</tabstop>

sources/ui/dynamicelementtextitemeditor.cpp

@@ -146,7 +146,6 @@ void DynamicElementTextItemEditor::setCurrentText(DynamicElementTextItem *text)
 		return;
 
 	ui->m_tree_view->expand(index);
-//	ui->m_tree_view->expand(index.QModelIndex::model()->index(0,0));  // commented by plc-user: leads to crash, when other textitem was selected before
 	ui->m_tree_view->setCurrentIndex(index);
 	ui->m_remove_selection->setEnabled(true);
 }