Changeset f62e60 for src/UIElements

Timestamp:

Jan 27, 2015, 5:18:30 PM (10 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:

bed759

Parents:

1c3390

git-author:

Frederik Heber <heber@…> (01/18/15 12:22:39)

git-committer:

Frederik Heber <heber@…> (01/27/15 17:18:30)

Message:

Moved QtMoleculeList files into own subfolder.

• added QtMoleculeListView.
• we are going to need a lot of classes for this to work properly.

Location:

src/UIElements

Files:

• Makefile.am (modified) (5 diffs)
• Qt4/QtMainWindow.cpp (modified) (2 diffs)
• Views/Qt4/MoleculeList/QtMoleculeList.cpp (moved) (moved from src/UIElements/Views/Qt4/QtMoleculeList.cpp ) (1 diff)
• Views/Qt4/MoleculeList/QtMoleculeList.hpp (moved) (moved from src/UIElements/Views/Qt4/QtMoleculeList.hpp ) (2 diffs)
• Views/Qt4/MoleculeList/QtMoleculeListView.cpp (added)
• Views/Qt4/MoleculeList/QtMoleculeListView.hpp (added)

src/UIElements/Makefile.am

@@ -167 +167 @@
   UIElements/Qt4/QtDialog.cpp \
   UIElements/Qt4/QtUIFactory.cpp \
+  UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp \
+  UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.cpp \
   UIElements/Menu/Qt4/QtMenuPipe.cpp \
   UIElements/Views/Qt4/QtElementList.cpp \
@@ -173 +175 @@
   UIElements/Views/Qt4/QtInfoBox.cpp \
   UIElements/Views/Qt4/QtLogBox.cpp \
-  UIElements/Views/Qt4/QtMoleculeList.cpp \
   UIElements/Views/Qt4/QtShapeController.cpp \
   UIElements/Views/Qt4/QtShapeList.cpp \
@@ -195 +196 @@
   UIElements/Menu/Qt4/QMenu_tooltip.hpp \
   UIElements/Menu/Qt4/QtMenuPipe.hpp \
-  UIElements/Views/Qt4/QDebugStream.hpp \
+  UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp \
+  UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.hpp \
   UIElements/Views/Qt4/QtElementList.hpp \
   UIElements/Views/Qt4/QtFragmentList.hpp \
@@ -201 +203 @@
   UIElements/Views/Qt4/QtInfoBox.hpp \
   UIElements/Views/Qt4/QtLogBox.hpp \
-  UIElements/Views/Qt4/QtMoleculeList.hpp \
   UIElements/Views/Qt4/QtShapeController.hpp \
   UIElements/Views/Qt4/QtShapeList.hpp \
@@ -224 +225 @@
   UIElements/Menu/Qt4/QtMenu.hpp \
   UIElements/Qt4/Query/QtQueryList.hpp \
-  UIElements/Qt4/QtUIFactory.hpp
+  UIElements/Qt4/QtUIFactory.hpp \
+  UIElements/Views/Qt4/QDebugStream.hpp
 
 lib_LTLIBRARIES += libMolecuilderUI.la

src/UIElements/Qt4/QtMainWindow.cpp

@@ -53 +53 @@
 
 #include "Menu/Qt4/QtMenu.hpp"
-#include "Views/Qt4/QtMoleculeList.hpp"
+#include "Views/Qt4/MoleculeList/QtMoleculeList.hpp"
+#include "Views/Qt4/MoleculeList/QtMoleculeListView.hpp"
 #include "Views/Qt4/QtElementList.hpp"
 #include "Views/Qt4/QtFragmentList.hpp"
@@ -95 +96 @@
   QVBoxLayout *layout = new QVBoxLayout(layoutwidget);
 
-  QTreeView *moleculeListView = new QTreeView(worldTab);
+  QtMoleculeListView *moleculeListView = new QtMoleculeListView(worldTab);
   moleculeList = new QtMoleculeList;
   moleculeListView->setModel(moleculeList);
+
   elementList = new QtElementList(worldTab);
   homologyList = new QtHomologyList(worldTab);

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -33 +33 @@
 #endif
 
-#include "Views/Qt4/QtMoleculeList.hpp"
+#include "QtMoleculeList.hpp"
 
 #include <QMetaMethod>

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

@@ -27 +27 @@
 class molecule;
 class MoleculeListClass;
+class QtMoleculeListView;
 
 class QtMoleculeList : public QStandardItemModel, public Observer
@@ -68 +69 @@
   bool ChangingChildrensVisibility;
 
+  friend class QtMoleculeListView;
   QStandardItem * MoleculeToItem(const molecule * const _mol);