Changeset ea2663 for src/UIElements

Timestamp:

Apr 18, 2016, 10:33:41 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

55443e

Parents:

5771e6

git-author:

Frederik Heber <heber@…> (03/21/16 10:27:58)

git-committer:

Frederik Heber <heber@…> (04/18/16 22:33:41)

Message:

QtMoleculeItemFactory is pure static.

• QtMoleculeItemFactory was never needed as singleton as it has now state, contains now purely static variables and functions.

Location:

src/UIElements/Views/Qt4/MoleculeList

Files:

• QtMoleculeItemFactory.cpp (modified) (3 diffs)
• QtMoleculeItemFactory.hpp (modified) (4 diffs)
• QtMoleculeList.cpp (modified) (2 diffs)

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.cpp

@@ -44 +44 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "CodePatterns/Singleton_impl.hpp"
-
 // some attributes need to be easier to find for molecules
 // these attributes are skipped so far
@@ -54 +52 @@
 QtMoleculeItemFactory::COLUMNNAMES[QtMoleculeItemFactory::COLUMNCOUNT] =
     {"Name","Visibility", "Atoms","Formula","Occurrence"/*,"Size"*/};
-
-QtMoleculeItemFactory::QtMoleculeItemFactory()
-{
-}
 
 QList<QStandardItem *>
@@ -100 +94 @@
   return groupItems;
 }
-
-CONSTRUCT_SINGLETON(QtMoleculeItemFactory)

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.hpp

@@ -14 +14 @@
 #endif
 
-#include "CodePatterns/Singleton.hpp"
-
 #include <QList>
 
@@ -30 +28 @@
  * molecule.
  */
-class QtMoleculeItemFactory : public Singleton<QtMoleculeItemFactory>
+struct QtMoleculeItemFactory
 {
-  //!> grant Singleton access to cstor and dstor.
-  friend class Singleton<QtMoleculeItemFactory>;
-private:
-  // private constructor and destructor due to singleton
-  QtMoleculeItemFactory();
-  virtual ~QtMoleculeItemFactory() {}
 
-public:
   static const int COLUMNCOUNT;
   static const char *COLUMNNAMES[];
@@ -48 +39 @@
    * \return list of prepared items to be appended to a group item
    */
-  QList<QStandardItem *> createMoleculeItems(
+  static QList<QStandardItem *> createMoleculeItems(
       QtObservedMolecule::ptr &_ObservedMolecule);
 
@@ -56 +47 @@
    * \return list of prepared items to be appended to the invisibleRootItem()
    */
-  QList<QStandardItem *> createGroupItems(const std::string &_formula);
+  static QList<QStandardItem *> createGroupItems(const std::string &_formula);
 };
 

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -292 +292 @@
 {
   QList<QStandardItem *> groupItems =
-      QtMoleculeItemFactory::getInstance().createGroupItems(_molecule_formula);
+      QtMoleculeItemFactory::createGroupItems(_molecule_formula);
   mainitem = groupItems.front();
   FormulaItemBiMap.left.insert( std::make_pair(_molecule_formula, mainitem) );
@@ -303 +303 @@
 {
   QList<QStandardItem *> molItems =
-      QtMoleculeItemFactory::getInstance().createMoleculeItems(_ObservedMolecule);
+      QtMoleculeItemFactory::createMoleculeItems(_ObservedMolecule);
   QtMoleculeItem *mol_item = dynamic_cast<QtMoleculeItem *>(molItems.front());
   ASSERT( mol_item != NULL,