Changeset 326a43b

Timestamp:

Feb 17, 2010, 5:07: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:

cbf01e

Parents:

b1d8092

Message:

Added a special class of Actions that take some time.
Added a statusbar to the window that shows world status and progress of the current processes.

Location:

src

Files:

• Actions/Process.cpp (added)
• Actions/Process.hpp (added)
• Actions/small_actions.hpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• UIElements/QT4/QTMainWindow.cpp (modified) (2 diffs)
• UIElements/QT4/QTMainWindow.hpp (modified) (2 diffs)
• Views/QT4/QTStatusBar.cpp (added)
• Views/QT4/QTStatusBar.hpp (added)
• World.cpp (modified) (1 diff)
• builder.cpp (modified) (2 diffs)
• helpers.hpp (modified) (1 diff)

src/Actions/small_actions.hpp

@@ -1 +1 @@
 // All rather small Actions should go into this file for simplicities sake
 
+#ifndef _SMALL_ACTIONS_HPP
+#define _SMALL_ACTIONS_HPP
+
 #include "Actions/Action.hpp"
-
+#include "Actions/Process.hpp"
 
 class MoleculeListClass;
@@ -9 +12 @@
 public:
   ChangeMoleculeNameAction(MoleculeListClass*);
-  ~ChangeMoleculeNameAction();
+  virtual ~ChangeMoleculeNameAction();
 
   void call();
@@ -21 +24 @@
   static char NAME[];
 };
+
+#endif // _SMALL_ACTIONS_HPP

src/Makefile.am

@@ -8 +8 @@
 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
 
-ACTIONSSOURCE = Actions/Action.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ActionRegistry.cpp 
-ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ActionRegistry.hpp
+ACTIONSSOURCE = Actions/Action.cpp Actions/Process.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ActionRegistry.cpp 
+ACTIONSHEADER = Actions/Action.hpp Actions/Process.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ActionRegistry.hpp
 
 PATTERNSOURCE = Patterns/Observer.cpp
@@ -33 +33 @@
 LEGACYHEADER = Legacy/oldmenu.hpp
 
-
-QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp UIElements/QT4/QTDialog.hpp Menu/QT4/QTMenu.hpp  Views/QT4/QTMoleculesView.hpp Views/QT4/GLMoleculeView.hpp
-QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp QTDialog.moc.cpp QTMoleculesView.moc.cpp GLMoleculeView.moc.cpp
+QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp UIElements/QT4/QTDialog.hpp Menu/QT4/QTMenu.hpp  Views/QT4/QTMoleculesView.hpp Views/QT4/GLMoleculeView.hpp Views/QT4/QTStatusBar.hpp 
+QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp QTDialog.moc.cpp QTMoleculesView.moc.cpp GLMoleculeView.moc.cpp QTStatusBar.moc.cpp
 
 DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp Descriptors/AtomIdDescriptor.cpp
 DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp Descriptors/AtomIdDescriptor.hpp
 
-QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTDialog.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp Views/QT4/QTMoleculesView.cpp Views/QT4/GLMoleculeView.cpp
+QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTDialog.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp Views/QT4/QTMoleculesView.cpp Views/QT4/GLMoleculeView.cpp Views/QT4/QTStatusBar.cpp
 QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
 

src/UIElements/QT4/QTMainWindow.cpp

@@ -22 +22 @@
 #include "Views/QT4/QTMoleculesView.hpp"
 #include "Views/QT4/GLMoleculeView.hpp"
+#include "Views/QT4/QTStatusBar.hpp"
 
 
@@ -43 +44 @@
   splitter2->addWidget(moleculeDisplay);
 
-
-
+  statusBar = new QTStatusBar(this);
+  setStatusBar(statusBar);
 
   editMoleculesMenu = new QTMenu("Edit Molecules");

src/UIElements/QT4/QTMainWindow.hpp

@@ -16 +16 @@
 class QTMenu;
 class GLMoleculeView;
+class QTStatusBar;
 
 class QTMainWindow : public QMainWindow, public MainWindow
@@ -34 +35 @@
   QTMenu *editMoleculesMenu;
   GLMoleculeView *molecule3dDisplay;
+  QTStatusBar *statusBar;
 
 };

src/World.cpp

@@ -59 +59 @@
     periode(new periodentafel),
     molecules_deprecated(new MoleculeListClass)
-{}
+{
+  molecules_deprecated->signOn(this);
+}
 
 World::~World()

src/builder.cpp

@@ -2168 +2168 @@
 
 void cleanUp(config *configuration){
+  UIFactory::purgeInstance();
   World::destroy();
   delete(configuration);
@@ -2177 +2178 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
-  UIFactory::purgeInstance();
   ActionRegistry::purgeRegistry();
 }

src/helpers.hpp

@@ -187 +187 @@
 };
 
-
+#define PLURAL_S(v) (((v)==1)?"":"s")
 
 #endif /*HELPERS_HPP_*/