Changeset 56fb09 for src/UIElements

Timestamp:

Jun 30, 2010, 8:35:38 AM (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, Candidate_v1.7.0, 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:

5ec8e3

Parents:

51a5c8 (diff), 8e0c63 (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 'stable' into StructureRefactoring

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineUIFactory.hpp (modified) (1 diff)
• Dialog.hpp (modified) (1 diff)
• TextUI/TextWindow.cpp (modified) (4 diffs)
• TextUI/TextWindow.hpp (modified) (1 diff)
• UIFactory.hpp (modified) (1 diff)

src/UIElements/CommandLineUI/CommandLineUIFactory.hpp

@@ -11 +11 @@
 #include "UIFactory.hpp"
 
+/** This class is a specialization of the UIFactory.
+ *
+ * <h2> Introduction </h2>
+ *
+ * The UIFactory is a base class for the User Interaction. There are three UI specializations:
+ * Text, GUI and CommandLine.
+ *
+ * The idea of the command line part is as follows:
+ *
+ * All actions that can be called from the command line are instantiated via populater-functions.
+ * In the constructor of an action it is automatically registered with the ActionRegistry and can
+ * henceforth be looked up there.
+ *
+ * There is a CommandLineParser which parses the command line parameters and puts all found values
+ * into a map. Then, MainWindow::Display of the CommandLineUIFactory is called, which goes through
+ * every action (by the ActionRegistry) and looks through the parsed commands whether the action is
+ * desired.
+ *
+ * In the action itself, Query's ask for user input. In the CommandLine case, we don't want direct
+ * user interaction, but the user has to have those values already delivered along with the desired
+ * action. Hence, the Query implementations just look up the desired values in the CommandLineParser
+ * vaults. When they are not found, an exception is thrown. When all are found, the action is performed.
+ *
+ */
 class CommandLineUIFactory : public UIFactory
 {

src/UIElements/Dialog.hpp

@@ -18 +18 @@
 class Vector;
 
+
+/** Dialog is one of the two main classes of the UIFactory base class.
+ *
+ * The Dialog is meant for asking the user for information needed to perform actions he
+ * desires, such as asking for a position in space or a length.
+ *
+ * For this purpose there is the base class Query and numerous specializations for each
+ * of the types to be asked. There are primitives integer, doubles and string, but also
+ * advanced types such as element, molecule or Vector. There is also an empty query for
+ * displaying text.
+ */
 class Dialog
 {

src/UIElements/TextUI/TextWindow.cpp

@@ -7 +7 @@
 
 #include "Helpers/MemDebug.hpp"
-
-#include "TextUI/TextWindow.hpp"
 
 #include <boost/bind.hpp>
@@ -19 +17 @@
 #include "Menu/SubMenuItem.hpp"
 #include "TextUI/TextStatusIndicator.hpp"
+#include "TextUI/TextWindow.hpp"
 #include "Actions/MapOfActions.hpp"
 #include "Actions/MethodAction.hpp"
@@ -40 +39 @@
 #include <iostream>
 #include <map>
-
-using namespace std;
 
 // TODO: see what code can be moved to a base class for Graphic and Text Windows
@@ -110 +107 @@
 }
 
-char TextWindow::getSuitableShortForm(set <char> &ShortcutList, const std::string name) const
+char TextWindow::getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const
 {
   for (std::string::const_iterator CharRunner = name.begin(); CharRunner != name.end(); ++CharRunner) {

src/UIElements/TextUI/TextWindow.hpp

@@ -27 +27 @@
 
   virtual void display();
+
 private:
   // populaters

src/UIElements/UIFactory.hpp

@@ -25 +25 @@
  * only create UIelements of that certain type, so that all UIElements match. This way different
  * UIs can be handled in a concise abstract way.
+ *
+ * The main functionality is the MainWindow and the Dialog.
+ *
+ * MainWindow basically is the framework if the UI. The MainWindow has a run function which is
+ * called MainWindow::Display(), which will listen for user input and react to it via actions for
+ * as long as the user desires or tells the MainWindow to quit.
+ *
+ * Within the MainWindow Dialog classes may be instantiated which ask the user for input to
+ * certain actions he wants to perform.
+ *
  */
 class UIFactory : public Singleton<UIFactory,false>