Changeset 68d781 for src/UIElements

Timestamp:

Mar 25, 2010, 1:36:36 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:

fdd840

Parents:

cd032d (diff), f6bbc6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MenuRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/defs.hpp

Location:

src/UIElements

Files:

• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (2 diffs)
• QT4/QTDialog.cpp (modified) (4 diffs)
• QT4/QTDialog.hpp (modified) (4 diffs)
• TextDialog.cpp (modified) (2 diffs)
• TextDialog.hpp (modified) (2 diffs)
• TextWindow.cpp (modified) (4 diffs)
• TextWindow.hpp (modified) (1 diff)

src/UIElements/Dialog.cpp

@@ -148 +148 @@
 
 // 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();
@@ -126 +126 @@
   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/QT4/QTDialog.cpp

@@ -98 +98 @@
 }
 
-void QTDialog::queryElement(const char* title, element **target){
+void QTDialog::queryElement(const char* title, const element **target){
   registerQuery(new ElementQTQuery(title,target,inputLayout,this));
 }
@@ -262 +262 @@
 
 
-QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, element **_target, QBoxLayout *_parent, QTDialog *_dialog) :
+QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, const element **_target, QBoxLayout *_parent, QTDialog *_dialog) :
     Dialog::ElementQuery(_title,_target),
     parent(_parent)
@@ -270 +270 @@
   titleLabel = new QLabel(QString(getTitle().c_str()));
   inputBox = new QComboBox();
-  element* Elemental = 0;
-  for(Elemental = periode->start->next;
-      Elemental!=periode->end;
-      Elemental = Elemental->next)
+  for(periodentafel::const_iterator iter = periode->begin();
+      iter!=periode->end();
+      ++iter)
   {
     stringstream sstr;
-    sstr << Elemental->Z << "\t" << Elemental->name;
-    inputBox->addItem(QString(sstr.str().c_str()),QVariant(Elemental->Z));
+    sstr << (*iter).first << "\t" << (*iter).second->name;
+    inputBox->addItem(QString(sstr.str().c_str()),QVariant((*iter).first));
   }
   parent->addLayout(thisLayout);
@@ -355 +354 @@
 }
 
-ElementQTQueryPipe::ElementQTQueryPipe(element **_content, QTDialog *_dialog, QComboBox *_theBox) :
+ElementQTQueryPipe::ElementQTQueryPipe(const element **_content, QTDialog *_dialog, QComboBox *_theBox) :
   content(_content),
   dialog(_dialog),

src/UIElements/QT4/QTDialog.hpp

@@ -40 +40 @@
   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 **);
 
   virtual bool display();
@@ -122 +122 @@
     class ElementQTQuery : public Dialog::ElementQuery {
     public:
-      ElementQTQuery(std::string _title, element **_target, QBoxLayout *_parent, QTDialog *_dialog);
+      ElementQTQuery(std::string _title, const element **_target, QBoxLayout *_parent, QTDialog *_dialog);
       virtual ~ElementQTQuery();
       virtual bool handle();
@@ -210 +210 @@
   Q_OBJECT
 public:
-  ElementQTQueryPipe(element **_content, QTDialog *_dialog, QComboBox *_theBox);
+  ElementQTQueryPipe(const element **_content, QTDialog *_dialog, QComboBox *_theBox);
   virtual ~ElementQTQueryPipe();
 
@@ -217 +217 @@
 
 private:
-  element **content;
+  const element **content;
   QTDialog *dialog;
   QComboBox *theBox;

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)
 {}

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();

src/UIElements/TextWindow.cpp

@@ -39 +39 @@
 #include "Actions/MethodAction.hpp"
 #include "Actions/ErrorAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "Views/StreamStringView.hpp"
 #include "Views/MethodStringView.hpp"
@@ -56 +57 @@
   moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
   new DisplayMenuItem(main_menu,moleculeView,"Molecule List");
+
+  new SeperatorItem(main_menu);
+
+  Action* undoAction = ActionRegistry::getInstance().getActionByName("Undo");
+  new ActionMenuItem('u',"Undo last operation",main_menu,undoAction);
+
+  Action* redoAction = ActionRegistry::getInstance().getActionByName("Redo");
+  new ActionMenuItem('r',"Redo last operation",main_menu,redoAction);
 
   new SeperatorItem(main_menu);
@@ -94 +103 @@
   populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
 
-  returnFromEditMoleculeAction = new MethodAction("returnAction",boost::bind(&TextMenu::doQuit,editMoleculesMenu),false);
+  Action *returnFromEditMoleculeAction = new TextMenu::LeaveAction(editMoleculesMenu);
   MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",editMoleculesMenu,returnFromEditMoleculeAction);
 
@@ -108 +117 @@
   delete old_menu;
   delete quitAction;
-  delete returnFromEditMoleculeAction;
   delete moleculeView;
   delete statusIndicator;

src/UIElements/TextWindow.hpp

@@ -29 +29 @@
   // some actions only needed in textMenus
   Action *quitAction;
-  Action *returnFromEditMoleculeAction;
   // all views that are contained in the main Menu
   StringView *moleculeView;