Changeset b2c2e4 for src/UIElements

Timestamp:

Feb 14, 2016, 12:33:41 PM (9 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:

04c3a3

Parents:

cf9287

git-author:

Frederik Heber <heber@…> (10/30/15 16:07:39)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:33:41)

Message:

FIX: Qt's parent properly set from QtMainWindow's point of view.

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.cpp (modified) (2 diffs)
• Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (1 diff)
• Views/Qt4/MoleculeList/QtMoleculeList.hpp (modified) (1 diff)
• Views/Qt4/QtInfoBox.cpp (modified) (1 diff)
• Views/Qt4/QtInfoBox.hpp (modified) (1 diff)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -106 +106 @@
   QVBoxLayout *layout = new QVBoxLayout(layoutwidget);
 
-  selectionagent = new QtSelectionChangedAgent(this);
-
-  QtMoleculeListView *moleculeListView = new QtMoleculeListView(worldTab);
-  moleculeList = new QtMoleculeList(InstanceBoard);
+  QtMoleculeListView *moleculeListView = new QtMoleculeListView(InstanceBoard);
+  selectionagent = new QtSelectionChangedAgent(moleculeListView);
+  moleculeList = new QtMoleculeList(InstanceBoard, moleculeListView);
   moleculeListView->setModel(moleculeList);
   moleculeListView->setSelectionChangedAgent(selectionagent);
@@ -122 +121 @@
 
   infoBox = new QtInfoBox(InstanceBoard);
-  glWorldView = new GLWorldView(InstanceBoard, this);
+  glWorldView = new GLWorldView(InstanceBoard, InstanceBoard);
   glWorldView->setSizePolicy( QSizePolicy::Expanding,QSizePolicy::Expanding);
   glWorldView->setMinimumSize( QSize(640,480) );

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

@@ -69 +69 @@
 
 QtMoleculeList::QtMoleculeList(
-    QtObservedInstanceBoard *_board) :
+    QtObservedInstanceBoard *_board,
+    QObject *_parent) :
+  QStandardItemModel(_parent),
   update_timer(NULL),
   board(_board),

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

@@ -39 +39 @@
 
 public:
-  QtMoleculeList(QtObservedInstanceBoard *_board);
+  QtMoleculeList(QtObservedInstanceBoard *_board, QObject *_parent = NULL);
   virtual ~QtMoleculeList();
 

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -52 +52 @@
 /***************** Basic structure for tab layout ***********/
 
-QtInfoBox::QtInfoBox(QtObservedInstanceBoard *_board) :
-    QTabWidget(),
+QtInfoBox::QtInfoBox(QtObservedInstanceBoard *_board, QWidget *_parent) :
+    QTabWidget(_parent),
     curAtomId(-1), nextAtomId(-1),
     curMoleculeId(-1), nextMoleculeId(-1),

src/UIElements/Views/Qt4/QtInfoBox.hpp

@@ -39 +39 @@
   Q_OBJECT
 public:
-  QtInfoBox(QtObservedInstanceBoard *_board);
+  QtInfoBox(QtObservedInstanceBoard *_board, QWidget *_parent = NULL);
   virtual ~QtInfoBox();