Changeset a881f5 for src/UIElements

Timestamp:

Aug 5, 2010, 8:06:42 PM (15 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:

6d587e

Parents:

5fbaeb (diff), f761c4 (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 'StructureRefactoring' into stable

Conflicts:

src/Actions/AnalysisAction/PairCorrelationAction.hpp
src/Actions/AnalysisAction/SurfaceCorrelationAction.hpp

• due to different ordering of vector, string includes

Location:

src/UIElements

Files:

• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• Menu/TextMenu.cpp (modified) (1 diff)
• Menu/TextMenu.hpp (modified) (1 diff)
• QT4/QTDialog.cpp (modified) (1 diff)
• TextUI/TextDialog.cpp (modified) (2 diffs)
• TextUI/TextWindow.cpp (modified) (1 diff)

src/UIElements/Dialog.cpp

@@ -68 +68 @@
 }
 
+bool Dialog::hasQueries(){
+  return queries.size();
+}
+
 /****************** Query types Infrastructure **************************/
 

src/UIElements/Dialog.hpp

@@ -61 +61 @@
   virtual void setAll();
 
+  virtual bool hasQueries();
+
 protected:
   // methodology for handling queries

src/UIElements/Makefile.am

@@ -46 +46 @@
   Dialog.cpp \
   MainWindow.cpp \
-  UIFactory.cpp \
   ValueStorage.cpp
   
@@ -57 +56 @@
   Dialog.hpp \
   MainWindow.hpp \
-  UIFactory.hpp \
   ValueStorage.hpp
 
@@ -82 +80 @@
   CommandLineUI/CommandLineWindow.hpp
 
-
+unity.cpp:
+        echo "" >  unity.cpp; \
+        list='$(UISOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done;
+        
+MOSTLYCLEANFILES = unity.cpp

src/UIElements/Menu/TextMenu.cpp

@@ -127 +127 @@
 }
 
-Dialog* TextMenu::LeaveAction::createDialog(){
+Dialog* TextMenu::LeaveAction::fillDialog(Dialog *dialog){
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+  return dialog;
 }
 

src/UIElements/Menu/TextMenu.hpp

@@ -35 +35 @@
     bool shouldUndo();
 
+  protected:
+    virtual Dialog* fillDialog(Dialog *dialog);
   private:
-    virtual Dialog* createDialog();
     virtual Action::state_ptr performCall();
     virtual Action::state_ptr performUndo(Action::state_ptr);

src/UIElements/QT4/QTDialog.cpp

@@ -23 +23 @@
 #include <Qt/qpushbutton.h>
 #include <Qt/qcombobox.h>
+
+#include <boost/lexical_cast.hpp>
 
 #include "Helpers/MemDebug.hpp"

src/UIElements/TextUI/TextDialog.cpp

@@ -14 +14 @@
 #include <Descriptors/MoleculeDescriptor.hpp>
 #include <Descriptors/MoleculeIdDescriptor.hpp>
+#include <boost/lexical_cast.hpp>
 #include "TextUI/TextDialog.hpp"
 
@@ -524 +525 @@
     }
   }
+  return true;
 }
 

src/UIElements/TextUI/TextWindow.cpp

@@ -25 +25 @@
 #include "Views/StreamStringView.hpp"
 #include "Views/MethodStringView.hpp"
-#include "Helpers/MemDebug.hpp"
 
 #include "defs.hpp"