Changeset 835a0f

Timestamp:

Dec 16, 2009, 12:30:16 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:

c68025

Parents:

a306a2

git-author:

Tillmann Crueger <crueger@…> (12/16/09 09:49:55)

git-committer:

Frederik Heber <heber@…> (12/16/09 12:30:16)

Message:

Added Title to DisplayMenuItems. Signed-off-by: Tillmann Crueger <crueger@…>

Location:

src

Files:

• Menu/DisplayMenuItem.cpp (modified) (2 diffs)
• Menu/DisplayMenuItem.hpp (modified) (3 diffs)
• menu.cpp (modified) (1 diff)
• moleculelist.cpp (modified) (2 diffs)

src/Menu/DisplayMenuItem.cpp

@@ -6 +6 @@
  */
 
+#include <sstream>
+#include <cmath>
+
 #include "Menu/DisplayMenuItem.hpp"
 #include "Views/StringView.hpp"
 
-#include <iostream>
 
 DisplayMenuItem::DisplayMenuItem(Menu* _menu, StringView *_view):
 MenuItem('\0',"",_menu),
-view(_view)
+view(_view),
+title("")
 {
+}
 
+DisplayMenuItem::DisplayMenuItem(Menu* _menu, StringView *_view, string _title, char _spacer, int _length ):
+MenuItem('\0',"",_menu),
+view(_view),
+title(_title),
+spacer(_spacer),
+length(_length)
+{
 }
 
@@ -28 +39 @@
 
 const string DisplayMenuItem::formatEntry(){
-  return view->toString();
+  stringstream s;
+  if(title.length()>0) {
+    int pre = floor((length-title.length())/2.0);
+    int post = ceil((length-title.length())/2.0);
+    for(int i=0;i<pre;i++)
+      s << spacer;
+    s << title;
+    for(int i=0;i<post;i++)
+          s << spacer;
+    s << "\n";
+  }
+  s << view->toString();
+  return s.str();
 }
 

src/Menu/DisplayMenuItem.hpp

@@ -10 +10 @@
 
 #include "Menu/MenuItem.hpp"
+#include "defs.hpp"
 
 class StringView;
@@ -17 +18 @@
 public:
   DisplayMenuItem(Menu* _menu, StringView *_view);
+  DisplayMenuItem(Menu* _menu, StringView *_view, string _title,
+                  char _spacer=STD_MENU_TITLE_SPACER, int _length=STD_MENU_LENGTH);
   virtual ~DisplayMenuItem();
 
@@ -28 +31 @@
 private:
   StringView *view;
+  string title;
+  int length;
+  char spacer;
 };
 

src/menu.cpp

@@ -1229 +1229 @@
 
   StringView *moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
-  new DisplayMenuItem(main_menu,moleculeView);
+  new DisplayMenuItem(main_menu,moleculeView,"Molecule List");
 
   new SeperatorItem(main_menu);

src/moleculelist.cpp

@@ -142 +142 @@
 
   // header
-  Log() << Verbose(0) << "Index\tName\t\tAtoms\tFormula\tCenter\tSize" << endl;
-  Log() << Verbose(0) << "-----------------------------------------------" << endl;
+  (*out) << "Index\tName\t\tAtoms\tFormula\tCenter\tSize" << endl;
+  (*out) << "-----------------------------------------------" << endl;
   if (ListOfMolecules.size() == 0)
-    Log() << Verbose(0) << "\tNone" << endl;
+    (*out) << "\tNone" << endl;
   else {
     Origin.Zero();
@@ -162 +162 @@
       }
       // output Index, Name, number of atoms, chemical formula
-      Log() << Verbose(0) << ((*ListRunner)->ActiveFlag ? "*" : " ") << (*ListRunner)->IndexNr << "\t" << (*ListRunner)->name << "\t\t" << (*ListRunner)->AtomCount << "\t";
+      (*out) << ((*ListRunner)->ActiveFlag ? "*" : " ") << (*ListRunner)->IndexNr << "\t" << (*ListRunner)->name << "\t\t" << (*ListRunner)->AtomCount << "\t";
       Elemental = (*ListRunner)->elemente->end;
       while(Elemental->previous != (*ListRunner)->elemente->start) {
         Elemental = Elemental->previous;
         if (Counts[Elemental->Z] != 0)
-          Log() << Verbose(0) << Elemental->symbol << Counts[Elemental->Z];
+          (*out) << Elemental->symbol << Counts[Elemental->Z];
       }
       // Center and size
-      Log() << Verbose(0) << "\t" << (*ListRunner)->Center << "\t" << sqrt(size) << endl;
+      (*out) << "\t" << (*ListRunner)->Center << "\t" << sqrt(size) << endl;
     }
   }