Changeset 3c9ac3 for src/UIElements

Timestamp:

Jul 12, 2017, 7:12:47 PM (7 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.

Location:

src/UIElements/Views/Qt4

Files:

• QtGeometryList.cpp (modified) (4 diffs)
• QtGeometryList.hpp (modified) (1 diff)
• QtHomologyList.cpp (modified) (4 diffs)
• QtHomologyList.hpp (modified) (1 diff)
• QtShapeList.cpp (modified) (4 diffs)
• QtShapeList.hpp (modified) (1 diff)

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) {
 }
 

src/UIElements/Views/Qt4/QtGeometryList.hpp

@@ -48 +48 @@
 
 private:
+  //!> flag to indicate that we are signed on to GeometryRegistry
+  bool geometryregistry_enabled;
 
   mutable boost::recursive_mutex refill_mutex;

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -78 +78 @@
     QWidget(_parent),
     Observer("QtHomologyList"),
+    homologycontainer_enabled(false),
     potentialregistry_enabled(false)
 {
@@ -118 +119 @@
         HomologyContainer &homologies = World::getInstance().getHomologies();
         homologies.signOn(this);
+        homologycontainer_enabled = true;
         PotentialRegistry::getInstance().signOn(this);
         potentialregistry_enabled = true;
@@ -144 +146 @@
 
 
-  HomologyContainer &homologies = World::getInstance().getHomologies();
-  homologies.signOff(this);
+  if (homologycontainer_enabled) {
+    HomologyContainer &homologies = World::getInstance().getHomologies();
+    homologies.signOff(this);
+  }
   if (potentialregistry_enabled)
     PotentialRegistry::getInstance().signOff(this);
@@ -304 +308 @@
   if (static_cast<PotentialRegistry *>(publisher) == PotentialRegistry::getPointer()) {
     potentialregistry_enabled = false;
-  } else {
-    // its HomologyContainer
+  } else if (static_cast<HomologyContainer *>(publisher) == &World::getInstance().getHomologies()) {
+    homologycontainer_enabled = false;
   }
 }

src/UIElements/Views/Qt4/QtHomologyList.hpp

@@ -55 +55 @@
   //!> flag to indicate that we got an update
   bool dirty;
+  //!> flag to indicate whether we are subscribed to HomologyContainer
+  bool homologycontainer_enabled;
   //!> flag to indicate whether we are subscribed to PotentialRegistry
   bool potentialregistry_enabled;

src/UIElements/Views/Qt4/QtShapeList.cpp

@@ -55 +55 @@
 QtShapeList::QtShapeList(QWidget * _parent) :
     QTreeWidget (_parent),
-    Observer("QtShapeList")
+    Observer("QtShapeList"),
+    shaperegistry_enabled(false)
 {
   setColumnCount(COLUMNCOUNT);
@@ -73 +74 @@
   ShapeRegistry::getInstance().signOn(this, ShapeRegistry::ShapeRemoved);
   ShapeRegistry::getInstance().signOn(this, ShapeRegistry::SelectionChanged);
+  shaperegistry_enabled = true;
 
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
@@ -79 +81 @@
 QtShapeList::~QtShapeList()
 {
-  ShapeRegistry::getInstance().signOff(this);
-  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeInserted);
-  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeRemoved);
-  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::SelectionChanged);
+  if (shaperegistry_enabled) {
+    ShapeRegistry::getInstance().signOff(this);
+    ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeInserted);
+    ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeRemoved);
+    ShapeRegistry::getInstance().signOff(this, ShapeRegistry::SelectionChanged);
+  }
 }
 
@@ -148 +152 @@
 }
 
-void QtShapeList::subjectKilled(Observable *publisher) {
+void QtShapeList::subjectKilled(Observable *publisher)
+{
+  // as a new instance should always already be present ... just sign on
+  if (static_cast<ShapeRegistry *>(publisher) == ShapeRegistry::getPointer()) {
+    shaperegistry_enabled = false;
+  }
 }
-
 
 void QtShapeList::rowSelected()

src/UIElements/Views/Qt4/QtShapeList.hpp

@@ -54 +54 @@
   std::vector<bool> shapeSelection; //!< needed to determine when a selection changes
 
+  //!> flag to indicate whether we are signed on
+  bool shaperegistry_enabled;
+
   mutable boost::recursive_mutex refill_mutex;
 };