Changeset 0e6156 for src

Timestamp:

Apr 6, 2012, 11:57:19 AM (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:

f20fa5

Parents:

244f81

git-author:

Michael Ankele <ankele@…> (03/06/12 16:48:08)

git-committer:

Frederik Heber <heber@…> (04/06/12 11:57:19)

Message:

new class: QtElementList

Location:

src/UIElements

Files:

• Makefile.am (modified) (2 diffs)
• Qt4/QtMainWindow.cpp (modified) (3 diffs)
• Qt4/QtMainWindow.hpp (modified) (2 diffs)
• Views/Qt4/QtElementList.cpp (added)
• Views/Qt4/QtElementList.hpp (added)

src/UIElements/Makefile.am

@@ -199 +199 @@
   UIElements/Views/Qt4/QtWorldView.cpp \
   UIElements/Views/Qt4/QtMoleculeView.cpp \
+  UIElements/Views/Qt4/QtElementList.cpp \
   UIElements/Views/Qt4/QtStatusBar.cpp \
   UIElements/Views/Qt4/Qt3D/GLWorldView.cpp \
@@ -230 +231 @@
   UIElements/Views/Qt4/QtWorldView.hpp \
   UIElements/Views/Qt4/QtMoleculeView.hpp \
+  UIElements/Views/Qt4/QtElementList.hpp \
   UIElements/Views/Qt4/QtStatusBar.hpp \
   UIElements/Views/Qt4/Qt3D/GLWorldView.hpp \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -33 +33 @@
 #include "Menu/Qt4/QtMenu.hpp"
 #include "Views/Qt4/QtWorldView.hpp"
+#include "Views/Qt4/QtElementList.hpp"
 #include "Views/Qt4/QtMoleculeView.hpp"
 #include "Views/Qt4/QtStatusBar.hpp"
@@ -52 +53 @@
   QSplitter *splitter2 = new QSplitter (Qt::Vertical, splitter1 );
   QTabWidget *worldTab = new QTabWidget(splitter2);
-  QTableWidget *elementTable = new QTableWidget(worldTab);
 
-  worldDisplay = new QtWorldView(splitter2);
+  worldDisplay = new QtWorldView(worldTab);
+  elementList = new QtElementList(worldTab);
 
   moleculeDisplay = new QtMoleculeView();
@@ -72 +73 @@
   splitter2->addWidget(worldTab);
   worldTab->addTab(worldDisplay, "Molecules");
-  worldTab->addTab(elementTable, "All Elements");
+  worldTab->addTab(elementList, "All Elements");
 
   statusBar = new QtStatusBar(this);

src/UIElements/Qt4/QtMainWindow.hpp

@@ -24 +24 @@
 
 class QtWorldView;
+class QtElementList;
 class StringView;
 class GLWorldView;
@@ -44 +45 @@
   QApplication *theApp;
   QtWorldView *worldDisplay;
+  QtElementList *elementList;
   GLWorldView *molecule3dDisplay;
   QtMoleculeView *moleculeDisplay;