Changeset 4477b7

Timestamp:

Nov 15, 2012, 5:31:04 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:

a367b8

Parents:

4f041a4

git-author:

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

git-committer:

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

Message:

ShapeFactory: produce() implemented

Location:

src/Shapes

Files:

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

src/Shapes/ShapeFactory.cpp

@@ -37 +37 @@
 #include "ShapeFactory.hpp"
 
+#include "BaseShapes.hpp"
+#include "ShapeOps.hpp"
+
 #include "CodePatterns/Singleton_impl.hpp"
+#include "LinearAlgebra/Vector.hpp"
+#include "LinearAlgebra/RealSpaceMatrix.hpp"
 
-const char *ShapeFactory::shapeNames[ShapeFactory::SHAPETYPES_MAX] = {"sphere", "cube", "cylinder"};
+const char *ShapeFactory::shapeNames[ShapeFactory::SHAPETYPES_MAX] = {"nowhere", "everywhere", "sphere", "cube", "cylinder"};
 
 ShapeFactory::ShapeFactory()
@@ -87 +92 @@
 }
 
+Shape ShapeFactory::produce() const
+{
+  // Create the basic shape.
+  Shape s = Nowhere();
+  if (type == NOWHERE){
+    s = Nowhere();
+  }else if (type == EVERYWHERE){
+    s = Everywhere();
+  }else if (type == CUBE){
+    s = Cuboid();
+  }else if (type == SPHERE){
+    s = Sphere();
+  }else if (type == CYLINDER){
+    s = Cylinder();
+  }else{
+    ASSERT(false,
+        "ShapeFactory::produce - unhandled shape type: "+toString(type)+".");
+  }
+
+  // Transform (if necessary).
+  if (stretch != Vector(1., 1., 1.))
+    s = ::stretch(s, stretch);
+  for (int i=0; i<NDIM; i++)
+    if (angle[i] != 0){
+      RealSpaceMatrix rotation;
+      rotation.setRotation(angle);
+      s = transform(s, rotation);
+      break;
+    }
+  if (!translation.IsZero())
+    s = translate(s, translation);
+
+  return s;
+}
+
 CONSTRUCT_SINGLETON(ShapeFactory)

src/Shapes/ShapeFactory.hpp

@@ -18 +18 @@
 #include "LinearAlgebra/Vector.hpp"
 
+#include "Shape.hpp"
+
 class ShapeFactory : public Singleton<ShapeFactory>
 {
@@ -24 +26 @@
 public:
   enum ShapeType{
-    SPHERE, CUBE, CYLINDER, SHAPETYPES_MAX
+    NOWHERE, EVERYWHERE, SPHERE, CUBE, CYLINDER, SHAPETYPES_MAX
   };
 
@@ -43 +45 @@
   ShapeType getType() const { return type; }
   void setType(ShapeType type) { this->type = type; }
+
+  // create a shape
+  Shape produce() const;
 
 private: