Changeset 4f041a4 for src

Timestamp:

Nov 15, 2012, 5:29:43 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:

4477b7

Parents:

6e5d35

git-author:

Michael Ankele <ankele@…> (09/05/12 14:11:12)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:29:43)

Message:

ShapeFactory: factory state

Location:

src/Shapes

Files:

• ShapeFactory.cpp (modified) (3 diffs)
• ShapeFactory.hpp (modified) (4 diffs)

src/Shapes/ShapeFactory.cpp

@@ -34 +34 @@
 
 #include "CodePatterns/MemDebug.hpp"
-#include "CodePatterns/Log.hpp"
 
 #include "ShapeFactory.hpp"
@@ -51 +50 @@
   for (int i=0; i<SHAPETYPES_MAX; i++)
     nameShapeMap.insert(std::pair<std::string, ShapeType>(shapeNames[i], (ShapeType)i));
+
+  // Init state.
+  type = SPHERE;
+  translation.Zero();
+  stretch.Zero();
+  for (int i=0; i<NDIM; i++)
+    angle[i] = 0;
 }
 
@@ -73 +79 @@
 }
 
+
+void ShapeFactory::setStretch(const Vector &stretch)
+{
+  ASSERT(!stretch.IsZero(),
+      "ShapeFactory::setStretch() - stretch is zero.");
+  this->stretch = stretch;
+}
+
 CONSTRUCT_SINGLETON(ShapeFactory)

src/Shapes/ShapeFactory.hpp

@@ -16 +16 @@
 
 #include "CodePatterns/Singleton.hpp"
+#include "LinearAlgebra/Vector.hpp"
 
 class ShapeFactory : public Singleton<ShapeFactory>
@@ -29 +30 @@
   std::string getShapeName(ShapeType type);
 
+
+  // setters/getters for the current state
+  const double* getAngle() const { return angle; }
+  void setAngle(double angleX, double angleY, double angleZ) { angle[0] = angleX; angle[1] = angleY; angle[2] = angleZ; }
+
+  Vector getStretch() const { return stretch; }
+  void setStretch(const Vector &stretch);
+
+  Vector getTranslation() const { return translation; }
+  void setTranslation(const Vector &translation) { this->translation = translation; }
+
+  ShapeType getType() const { return type; }
+  void setType(ShapeType type) { this->type = type; }
+
 private:
   // private constructor and destructor due to singleton
@@ -34 +49 @@
   virtual ~ShapeFactory();
 
+  // name/type maps
   static const char *shapeNames[];
   typedef std::map<ShapeType, std::string> ShapeNameMap;
@@ -39 +55 @@
   typedef std::map<std::string,ShapeType> NameShapeMap;
   NameShapeMap nameShapeMap;
+
+  // current state
+  ShapeType type;
+  Vector translation;
+  Vector stretch;
+  double angle[NDIM];
 };