Changeset 4458b0

Timestamp:

Nov 15, 2012, 5:31:08 PM (12 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:

8f12de

Parents:

6131d8

git-author:

Michael Ankele <ankele@…> (09/14/12 13:17:00)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:31:08)

Message:

QtShapeList added

Location:

src/UIElements

Files:

• Makefile.am (modified) (2 diffs)
• Qt4/QtMainWindow.cpp (modified) (3 diffs)
• Qt4/QtMainWindow.hpp (modified) (2 diffs)
• Views/Qt4/QtInfoBox.cpp (modified) (1 diff)
• Views/Qt4/QtShapeList.cpp (added)
• Views/Qt4/QtShapeList.hpp (added)

src/UIElements/Makefile.am

@@ -167 +167 @@
   UIElements/Views/Qt4/QtInfoBox.cpp \
   UIElements/Views/Qt4/QtMoleculeList.cpp \
+  UIElements/Views/Qt4/QtShapeList.cpp \
   UIElements/Views/Qt4/QtStatusBar.cpp \
   UIElements/Views/Qt4/QtToolBar.cpp \
@@ -185 +186 @@
   UIElements/Views/Qt4/QtInfoBox.hpp \
   UIElements/Views/Qt4/QtMoleculeList.hpp \
+  UIElements/Views/Qt4/QtShapeList.hpp \
   UIElements/Views/Qt4/QtStatusBar.hpp \
   UIElements/Views/Qt4/QtToolBar.hpp \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -53 +53 @@
 #include "Views/Qt4/QtMoleculeList.hpp"
 #include "Views/Qt4/QtElementList.hpp"
+#include "Views/Qt4/QtShapeList.hpp"
 #include "Views/Qt4/QtInfoBox.hpp"
 #include "Views/Qt4/QtStatusBar.hpp"
@@ -80 +81 @@
   QSplitter *splitter1 = new QSplitter (Qt::Horizontal, this );
   QSplitter *splitter2 = new QSplitter (Qt::Vertical, splitter1 );
+  QSplitter *splitter3 = new QSplitter (Qt::Vertical, splitter1 );
   QTabWidget *worldTab = new QTabWidget(splitter2);
 
   moleculeList = new QtMoleculeList(worldTab);
   elementList = new QtElementList(worldTab);
+  shapeList = new QtShapeList(worldTab);
 
   infoBox = new QtInfoBox();
@@ -101 +104 @@
   setCentralWidget(splitter1);
   splitter1->addWidget(splitter2);
-  splitter1->addWidget(infoBox);
+  splitter1->addWidget(splitter3);
+  splitter1->setStretchFactor(0, 10);
+  splitter3->addWidget(infoBox);
+  splitter3->addWidget(shapeList);
   splitter2->addWidget(glWorldView);
   splitter2->addWidget(worldTab);

src/UIElements/Qt4/QtMainWindow.hpp

@@ -25 +25 @@
 class QtMoleculeList;
 class QtElementList;
+class QtShapeList;
 class StringView;
 class GLWorldView;
@@ -51 +52 @@
   QtMoleculeList *moleculeList;
   QtElementList *elementList;
+  QtShapeList *shapeList;
   GLWorldView *glWorldView;
   QtInfoBox *infoBox;

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -56 +56 @@
 
   setMinimumWidth(200);
+  setMinimumHeight(200);
   currentPage = 0;