Changeset 3c9ac3 for src/UIElements/Views/Qt4/QtGeometryList.cpp

Timestamp:

Jul 12, 2017, 7:12:47 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision

Children:

9a1e099

Parents:

4c6f0d

git-author:

Frederik Heber <frederik.heber@…> (07/12/17 14:34:42)

git-committer:

Frederik Heber <frederik.heber@…> (07/12/17 19:12:47)

Message:

Qt..Lists now take note of subjectKilled propery.

File:

• src/UIElements/Views/Qt4/QtGeometryList.cpp (modified) (4 diffs)

src/UIElements/Views/Qt4/QtGeometryList.cpp

@@ -54 +54 @@
 QtGeometryList::QtGeometryList(QWidget * _parent) :
     QTreeWidget (_parent),
-    Observer("QtGeometryList")
+    Observer("QtGeometryList"),
+    geometryregistry_enabled(false)
 {
   setColumnCount(COLUMNCOUNT);
@@ -73 +74 @@
         GeometryRegistry::getInstance().signOn(this, GeometryRegistry::GeometryInserted);
         GeometryRegistry::getInstance().signOn(this, GeometryRegistry::GeometryRemoved);
+        geometryregistry_enabled = true;
 
         QCoreApplication::instance()->installEventFilter(this);
@@ -79 +81 @@
 QtGeometryList::~QtGeometryList()
 {
-  GeometryRegistry::getInstance().signOff(this);
-  GeometryRegistry::getInstance().signOff(this, GeometryRegistry::GeometryInserted);
-  GeometryRegistry::getInstance().signOff(this, GeometryRegistry::GeometryRemoved);
+  if (geometryregistry_enabled) {
+    GeometryRegistry::getInstance().signOff(this);
+    GeometryRegistry::getInstance().signOff(this, GeometryRegistry::GeometryInserted);
+    GeometryRegistry::getInstance().signOff(this, GeometryRegistry::GeometryRemoved);
+  }
+}
+
+void QtGeometryList::subjectKilled(Observable *publisher)
+{
+  // as a new instance should always already be present ... just sign on
+  if (static_cast<GeometryRegistry *>(publisher) == GeometryRegistry::getPointer()) {
+    geometryregistry_enabled = false;
+  }
 }
 
@@ -133 +145 @@
     refill(NULL);*/
   QTreeWidget::paintEvent(event);
-}
-
-void QtGeometryList::subjectKilled(Observable *publisher) {
 }