Changeset d86d97

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:

6c2ae0, 780f25

Parents:

9a1e099

git-author:

Frederik Heber <frederik.heber@…> (07/12/17 15:08:55)

git-committer:

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

Message:

FIX: FragmentResultsContainer is no longer purged during run.

• so far, we used purgeInstance() in ParseFragmentResultsAction to clean its contents. Now, we simply use clean such that we may be sure of the signed on to instance in QtFragmentList and adhere its subjectKilled() properly.
• this also holds for DiffFragmentResultContainer.

Files:

• src/Actions/FragmentationAction/ParseFragmentResultsAction.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtFragmentList.cpp (modified) (5 diffs)
• src/UIElements/Views/Qt4/QtFragmentList.hpp (modified) (1 diff)
• tests/regression/DiffFragmentResultContainer.cpp (modified) (3 diffs)

src/Actions/FragmentationAction/ParseFragmentResultsAction.cpp

@@ -128 +128 @@
       assert_cast<FragmentationParseFragmentResultsState*>(_state.get());
 
-  FragmentationResultContainer::purgeInstance();
+  FragmentationResultContainer::getInstance().clear();
   FragmentationResultContainer& container = FragmentationResultContainer::getInstance();
   std::stringstream contents(state->streamed_container);

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -69 +69 @@
 QtFragmentList::QtFragmentList(QWidget * _parent) :
     QTreeWidget (_parent),
-    Observer("QtFragmentList")
+    Observer("QtFragmentList"),
+    dirty(true),
+    fragmentresultcontainer_enabled(false)
 {
   setColumnCount(COLUMNCOUNT);
@@ -81 +83 @@
         setSelectionMode( MultiSelection );
 
-        dirty = true;
-
   refill();
 
@@ -88 +88 @@
       FragmentationResultContainer::getInstance();
         fragments.signOn(this);
+        fragmentresultcontainer_enabled = true;
 
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
@@ -95 +96 @@
 QtFragmentList::~QtFragmentList()
 {
-  FragmentationResultContainer &fragments =
-      FragmentationResultContainer::getInstance();
-  fragments.signOff(this);
+  if (fragmentresultcontainer_enabled) {
+    FragmentationResultContainer &fragments =
+        FragmentationResultContainer::getInstance();
+    fragments.signOff(this);
+  }
 }
 
@@ -193 +196 @@
 {
   // as a new instance should always already be present ... just sign on
-  FragmentationResultContainer &fragments =
-      FragmentationResultContainer::getInstance();
-  fragments.signOn(this);
-}
-
+  if (static_cast<FragmentationResultContainer *>(publisher) == FragmentationResultContainer::getPointer()) {
+    fragmentresultcontainer_enabled = false;
+  }
+}
 
 void QtFragmentList::rowSelected()

src/UIElements/Views/Qt4/QtFragmentList.hpp

@@ -59 +59 @@
   //!> flag to indicate that we got an update
   bool dirty;
+  //!> flag to indicate that we are signed on to FragmentResultContainer
+  bool fragmentresultcontainer_enabled;
 };
 

tests/regression/DiffFragmentResultContainer.cpp

@@ -76 +76 @@
   }
 
+  FragmentationResultContainer &results = FragmentationResultContainer::getInstance();
   // deserialize and compare
   // Note that because FragmentationResultContainer is a singleton, we cannot
@@ -83 +84 @@
   std::stringstream outfile1;
   std::stringstream outfile2;
-  FragmentationResultContainer::purgeInstance();
+  results.clear();
   {
     std::ifstream infile(filenames[0].string().c_str());
-    FragmentationResultContainer &results = FragmentationResultContainer::getInstance();
     boost::archive::text_iarchive ia(infile);
     boost::archive::text_oarchive oa(outfile1);
@@ -92 +92 @@
     oa << results;
   }
-  FragmentationResultContainer::purgeInstance();
+  results.clear();
   {
     std::ifstream infile(filenames[1].string().c_str());
-    FragmentationResultContainer &results = FragmentationResultContainer::getInstance();
     boost::archive::text_iarchive ia(infile);
     boost::archive::text_oarchive oa(outfile2);