Changeset 5605032 for src/UIElements

Timestamp:

Mar 25, 2010, 1:01:35 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

f6bbc6

Parents:

9848ba

Message:

Repaired code that was broken by merge

Location:

src/UIElements

Files:

• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (2 diffs)
• TextDialog.cpp (modified) (3 diffs)
• TextDialog.hpp (modified) (2 diffs)

src/UIElements/Dialog.cpp

@@ -135 +135 @@
 
 // Element Queries
-Dialog::ElementQuery::ElementQuery(std::string title, element **_target) :
+Dialog::ElementQuery::ElementQuery(std::string title, const element **_target) :
   Query(title),
-  target(_target),
-  tmp(0)
+  tmp(0),
+  target(_target)
   {}
 

src/UIElements/Dialog.hpp

@@ -28 +28 @@
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*)=0;
   virtual void queryVector(const char*,Vector *,const double *const,bool)=0;
-  virtual void queryElement(const char*,element **)=0;
+  virtual void queryElement(const char*,const element **)=0;
 
   virtual bool display();
@@ -123 +123 @@
   class ElementQuery : public Query {
   public:
-    ElementQuery(std::string title, element**_target);
+    ElementQuery(std::string title, const element**_target);
     virtual ~ElementQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    element *tmp;
+    const element *tmp;
   private:
-    element **target;
+    const element **target;
   };
 

src/UIElements/TextDialog.cpp

@@ -49 +49 @@
 }
 
-void TextDialog::queryElement(const char* title, element **target){
+void TextDialog::queryElement(const char* title, const element **target){
   registerQuery(new ElementTextQuery(title,target));
 }
@@ -125 +125 @@
 
 
-TextDialog::ElementTextQuery::ElementTextQuery(std::string title, element **target) :
+TextDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target) :
     Dialog::ElementQuery(title,target)
 {}
@@ -136 +136 @@
   Log() << Verbose(0) << getTitle();
   cin >> Z;
-  tmp = World::get()->getPeriode()->FindElement(Z);
+  tmp = World::getInstance().getPeriode()->FindElement(Z);
   return tmp;
 }

src/UIElements/TextDialog.hpp

@@ -24 +24 @@
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
   virtual void queryVector(const char*,Vector *,const double * const,bool);
-  virtual void queryElement(const char*,element **);
+  virtual void queryElement(const char*,const element **);
 
 protected:
@@ -65 +65 @@
   class ElementTextQuery : public Dialog::ElementQuery {
   public:
-    ElementTextQuery(std::string title, element **_target);
+    ElementTextQuery(std::string title, const element **_target);
     virtual ~ElementTextQuery();
     virtual bool handle();