Changeset b2531f for src/Actions/MapOfActions.cpp

Timestamp:

Jun 27, 2010, 12:52:31 AM (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:

bdb143

Parents:

b0acc3

git-author:

Frederik Heber <heber@…> (06/26/10 23:55:00)

git-committer:

Frederik Heber <heber@…> (06/27/10 00:52:31)

Message:

Introduced a MenuBar and Menus to the QT interface.

• new map MapOfActions::MenuDescriptionMap which contains short and long descriptions of the menus.
• MapOfActions::populateActions() - rotate-to-pas and suspend-in-water actions were missing.
• QTMainWindow
  • QTMainWindow() - creates a MenuBar and QTMenus and fills them with the actions from the maps in MapOfActions.
  • new function populateMenu() - same as in TextWindow.
  • new function getSuitableShortForm() - same as in TextWindow.
• TextWindow::TextWindow() - also makes use of the new map MenuDescriptionMap.
• MoleculeSuspendInWaterAction - changed argument to density and molecule is obtained by molecule-by-id

• TESTFIX: Molecule/8 had wrong argument for rotate-to-pas
• TESTFIX: Filling/2 had missing molecule-by-id

File:

• src/Actions/MapOfActions.cpp (modified) (3 diffs)

src/Actions/MapOfActions.cpp

@@ -42 +42 @@
 #include "Actions/MoleculeAction/FillWithMoleculeAction.hpp"
 #include "Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp"
+#include "Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp"
 #include "Actions/MoleculeAction/SaveAdjacencyAction.hpp"
 #include "Actions/MoleculeAction/SaveBondsAction.hpp"
 #include "Actions/MoleculeAction/SaveTemperatureAction.hpp"
+#include "Actions/MoleculeAction/SuspendInWaterAction.hpp"
 #include "Actions/MoleculeAction/TranslateAction.hpp"
 #include "Actions/MoleculeAction/VerletIntegrationAction.hpp"
@@ -288 +290 @@
 
   // put action into each menu category
+  MenuDescription["analysis"] = pair<std::string,std::string>("Analysis (pair correlation, volume)", "Analysis");
+  MenuDescription["atom"] = pair<std::string,std::string>("Edit atoms", "Edit atoms");
+  MenuDescription["command"] = pair<std::string,std::string>("Configuration", "Configuration");
+  MenuDescription["fragmentation"] = pair<std::string,std::string>("Fragmentation", "Fragmentation");
+  MenuDescription["molecule"] = pair<std::string,std::string>("Parse files into system", "Parse files");
+  MenuDescription["parser"] = pair<std::string,std::string>("Edit molecules (load, parse, save)", "Edit molecules");
+  MenuDescription["tesselation"] = pair<std::string,std::string>("Tesselate molecules", "Tesselate molecules");
+  MenuDescription["world"] = pair<std::string,std::string>("Edit world", "Edit world");
+
   MenuContainsActionMap.insert( pair<std::string, std::string> ("analysis", "molecular-volume") );
   MenuContainsActionMap.insert( pair<std::string, std::string> ("analysis", "pair-correlation") );
@@ -445 +456 @@
   new MoleculeFillWithMoleculeAction();
   new MoleculeLinearInterpolationofTrajectoriesAction();
+  new MoleculeRotateToPrincipalAxisSystemAction();
   new MoleculeSaveAdjacencyAction();
   new MoleculeSaveBondsAction();
   new MoleculeSaveTemperatureAction();
+  new MoleculeSuspendInWaterAction();
   new MoleculeTranslateAction();
   new MoleculeVerletIntegrationAction();