Changeset 0b2be1 for src/UIElements

Timestamp:

Sep 26, 2012, 5:24:05 PM (13 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:

52575c

Parents:

6cab535

git-author:

Michael Ankele <ankele@…> (08/31/12 16:02:31)

git-committer:

Frederik Heber <heber@…> (09/26/12 17:24:05)

Message:

nicer QtInfoBox (bigger lists)

Location:

src/UIElements/Views/Qt4

Files:

• QtInfoBox.cpp (modified) (6 diffs)
• QtInfoBox.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -39 +39 @@
   timer = new QTimer(this);
   timer->setSingleShot(true);
+
+  setMinimumWidth(200);
 
   connect(timer, SIGNAL(timeout()), this, SLOT(timerTimeout()));
@@ -83 +85 @@
   // Show new tabs.
   if (curAtom){
-    page_atom = new QtAtomInfoPage(curAtom);
+    page_atom = new QtAtomInfoPage(curAtom, this);
     addTab(page_atom, "Atom");
     connect(page_atom, SIGNAL(atomKilled()), this, SLOT(clearTabs()));
 
     if (curAtom->getMolecule()){
-      page_mol = new QtMoleculeInfoPage(curAtom->getMolecule());
+      page_mol = new QtMoleculeInfoPage(curAtom->getMolecule(), this);
       addTab(page_mol, "Molecule");
       connect(page_mol, SIGNAL(moleculeKilled()), this, SLOT(clearTabs()));
@@ -104 +106 @@
 }
 
-QtAtomInfoPage::QtAtomInfoPage(const atom *_atom) :
+QtAtomInfoPage::QtAtomInfoPage(const atom *_atom, QWidget *parent) :
+  QTreeWidget(parent),
   Observer("QTAtomPage"),
   atomRef(_atom)
@@ -110 +113 @@
   atomRef->signOn(this);
 
-  info = new QTreeWidget(this);
-  info->setColumnCount(2);
+  setColumnCount(2);
   QStringList header;
   header << "data";
   header << "value";
-  info->setHeaderLabels(header);
+  setHeaderLabels(header);
 
-  addInfo(info, "Element", QString(atomRef->getElement().getName().c_str()));
-  addInfo(info, "Mass", QString("%1").arg(atomRef->getMass()));
-  addInfo(info, "Charge", QString("%1").arg(atomRef->getCharge()));
-  addInfo(info, "Position", QString(toString(atomRef->getPosition()).c_str()));
-  addInfo(info, "Bonds", QString("%1").arg(atomRef->getListOfBonds().size()));
+  addInfo(this, "Element", QString(atomRef->getElement().getName().c_str()));
+  addInfo(this, "Mass", QString("%1").arg(atomRef->getMass()));
+  addInfo(this, "Charge", QString("%1").arg(atomRef->getCharge()));
+  addInfo(this, "Position", QString(toString(atomRef->getPosition()).c_str()));
+  addInfo(this, "Bonds", QString("%1").arg(atomRef->getListOfBonds().size()));
 }
 
@@ -144 +146 @@
 /************************ Tab for single Molecules *****************/
 
-QtMoleculeInfoPage::QtMoleculeInfoPage(const molecule *_mol) :
+QtMoleculeInfoPage::QtMoleculeInfoPage(const molecule *_mol, QWidget *parent) :
+    QTreeWidget(parent),
     Observer("QTMoleculePage"),
     mol(_mol)
@@ -150 +153 @@
   mol->signOn(this);
 
-  info = new QTreeWidget(this);
-  info->setColumnCount(2);
+  setColumnCount(2);
   QStringList header;
   header << "data";
   header << "value";
-  info->setHeaderLabels(header);
+  setHeaderLabels(header);
 
-  addInfo(info, "Name", QString(mol->getName().c_str()));
-  addInfo(info, "Formula", QString(mol->getFormula().toString().c_str()));
-  addInfo(info, "Atoms", QString("%1").arg(mol->getAtomCount()));
-  addInfo(info, "Bonds", QString("%1").arg(mol->getBondCount()));
+  addInfo(this, "Name", QString(mol->getName().c_str()));
+  addInfo(this, "Formula", QString(mol->getFormula().toString().c_str()));
+  addInfo(this, "Atoms", QString("%1").arg(mol->getAtomCount()));
+  addInfo(this, "Bonds", QString("%1").arg(mol->getBondCount()));
 }
 

src/UIElements/Views/Qt4/QtInfoBox.hpp

@@ -55 +55 @@
  * Widget to display the tab page for a single atom
  */
-class QtAtomInfoPage : public QWidget, public Observer {
+class QtAtomInfoPage : public QTreeWidget, public Observer {
   Q_OBJECT
 public:
-  QtAtomInfoPage(const atom *_atom);
+  QtAtomInfoPage(const atom *_atom, QWidget *parent);
   virtual ~QtAtomInfoPage();
   void update(Observable *subject);
@@ -74 +74 @@
  * Widget to display the tab page for a single molecule
  */
-class QtMoleculeInfoPage : public QWidget,  public Observer {
+class QtMoleculeInfoPage : public QTreeWidget,  public Observer {
   Q_OBJECT
 public:
-  QtMoleculeInfoPage(const molecule *_mol);
+  QtMoleculeInfoPage(const molecule *_mol, QWidget *parent);
   virtual ~QtMoleculeInfoPage();