Changeset 8f12de

Timestamp:

Nov 15, 2012, 5:31:09 PM (12 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:

43c79a

Parents:

4458b0

git-author:

Michael Ankele <ankele@…> (09/14/12 13:51:26)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:31:09)

Message:

Shapes now selectable in ShapeRegistry

Location:

src/Shapes

Files:

• ShapeRegistry.cpp (modified) (1 diff)
• ShapeRegistry.hpp (modified) (4 diffs)

src/Shapes/ShapeRegistry.cpp

@@ -53 +53 @@
 }
 
+void ShapeRegistry::selectShape(const std::string& name)
+{
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  ASSERT(isPresentByName(name),"Shape selected that was not in the registry");
+  selectedShapes[name]=getByName(name);
+}
+
+void ShapeRegistry::selectShape(Shape* s)
+{
+  ASSERT(s,"Invalid pointer in selection of shape");
+  selectShape(s->getName());
+}
+
+void ShapeRegistry::unselectShape(const std::string& name)
+{
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  ASSERT(isPresentByName(name),"Shape unselected that was not in the registry");
+  selectedShapes.erase(name);
+}
+
+void ShapeRegistry::unselectShape(Shape* s)
+{
+  ASSERT(s,"Invalid pointer in unselection of shape");
+  unselectShape(s->getName());
+}
+
+void ShapeRegistry::selectAllShapes()
+{
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  const_iterator iter;
+  for (iter = getBeginIter(); iter != getEndIter(); iter ++)
+    if (!isSelected(iter->first))
+      selectedShapes[iter->first] = iter->second;
+}
+
+void ShapeRegistry::unselectAllShapes()
+{
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  selectedShapes.clear();
+}
+
+void ShapeRegistry::invertShapeSelection()
+{
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  std::map<std::string, Shape*> inverted;
+  const_iterator iter;
+  for (iter = getBeginIter(); iter != getEndIter(); iter ++)
+    if (!isSelected(iter->first))
+      inverted[iter->first] = iter->second;
+  selectedShapes = inverted;
+}
+
+bool ShapeRegistry::isSelected(const std::string& name) const
+{
+  return selectedShapes.find(name) != selectedShapes.end();
+}
+
+bool ShapeRegistry::isSelected(Shape* s) const
+{
+  ASSERT(s,"Invalid pointer in selection query of shape");
+  return isSelected(s->getName());
+}
+
+int ShapeRegistry::countSelectedShapes() const
+{
+  size_t count = 0;
+  for (const_iterator iter = selectedShapes.begin(); iter != selectedShapes.end(); ++iter)
+    count++;
+  return count;
+}
+
+std::vector<Shape*> ShapeRegistry::getSelectedShapes() const
+{
+  std::vector<Shape*> returnShapes;
+  returnShapes.resize(countSelectedShapes());
+  int count = 0;
+  for (const_iterator iter = selectedShapes.begin(); iter != selectedShapes.end(); ++iter)
+    returnShapes[count++] = iter->second;
+  return returnShapes;
+}
+
 ShapeRegistry::~ShapeRegistry()
 {

src/Shapes/ShapeRegistry.hpp

@@ -15 +15 @@
 #endif
 
+#include <map>
+
 #include "CodePatterns/Observer/Observable.hpp"
 #include "CodePatterns/Registry.hpp"
@@ -28 +30 @@
   void addShape(Shape s);
   void removeShape(const std::string &name);
-  Shape* getShapeByName(const std::string name);
-  bool isShapePresentByName(const std::string name) const;
+  //Shape* getShapeByName(const std::string name);
+  //bool isShapePresentByName(const std::string name) const;
   std::string getDefaultNameForShape(Shape s) const;
 
@@ -39 +41 @@
   };
 
+  void selectShape(const std::string &name);
+  void selectShape(Shape *s);
+  void unselectShape(const std::string &name);
+  void unselectShape(Shape *s);
+  void selectAllShapes();
+  void unselectAllShapes();
+  void invertShapeSelection();
+  bool isSelected(const std::string &name) const;
+  bool isSelected(Shape *s) const;
+  int countSelectedShapes() const;
+  std::vector<Shape*> getSelectedShapes() const;
+
 private:
   // private constructor and destructor due to singleton
@@ -44 +58 @@
   virtual ~ShapeRegistry();
 
+  std::map<std::string, Shape*> selectedShapes;
 };