Changeset a8f5d94 for src

Timestamp:

Oct 5, 2013, 9:32:58 AM (11 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:

291eca

Parents:

d20ded

git-author:

Frederik Heber <heber@…> (09/03/13 08:11:56)

git-committer:

Frederik Heber <heber@…> (10/05/13 09:32:58)

Message:

QtHomologyList is now a split with QTreeWidget and another widget.

Location:

src/UIElements/Views/Qt4

Files:

• QtHomologyList.cpp (modified) (8 diffs)
• QtHomologyList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -39 +39 @@
 
 #include <QAbstractItemView>
+#include <QtGui/QTreeWidget>
+#include<Qt/qsplitter.h>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -51 +53 @@
 
 QtHomologyList::QtHomologyList(QWidget * _parent) :
-    QTreeWidget (_parent),
+    QWidget(_parent),
     Observer("QtHomologyList")
 {
-  setColumnCount(COLUMNCOUNT);
-  setSelectionMode(QAbstractItemView::MultiSelection);
+  QSplitter *splitter = new QSplitter (Qt::Horizontal, this );
+  treewidget = new QTreeWidget (splitter);
+  splitter->addWidget(treewidget);
+  widget = new QWidget (splitter);
+  splitter->addWidget(widget);
+  splitter->setStretchFactor(10, 1);
+
+  treewidget->setColumnCount(COLUMNCOUNT);
+  treewidget->setSelectionMode(QAbstractItemView::MultiSelection);
 
   QStringList header;
         for(int i=0; i<COLUMNCOUNT;++i)
           header << COLUMNNAMES[i];
-        setHeaderLabels(header);
+        treewidget->setHeaderLabels(header);
 
         dirty = true;
@@ -70 +79 @@
         homologies.signOn(this);
 
-  connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
+  connect(treewidget,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
   connect(this,SIGNAL(changed()),this,SLOT(update()));
 }
@@ -86 +95 @@
   // force an update from Qt...
   clearing = true;
-  clear();
+  treewidget->clear();
   clearing = false;
   //emit changed(); doesn't work!?!
@@ -98 +107 @@
   // clear everything
   HomologySelection.clear();
-  clear();
+  treewidget->clear();
 
   size_t count = 0;
@@ -107 +116 @@
     const size_t times = std::distance(occurences.first, occurences.second);
 
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem(this);
+    QTreeWidgetItem *treeItem = new QTreeWidgetItem(treewidget);
     treeItem->setText(NUMBER, QString::number(count));
     {
@@ -135 +144 @@
   if (dirty)
     refill();
-  QTreeWidget::paintEvent(event);
+//  treewidget->paintEvent(event);
 }
 
@@ -149 +158 @@
 {
   //std::cout << "rowSelected\n";
-  for (int i=0;i<topLevelItemCount();i++){
-    QTreeWidgetItem *item = topLevelItem(i);
+  for (int i=0;i<treewidget->topLevelItemCount();i++){
+    QTreeWidgetItem *item = treewidget->topLevelItem(i);
     bool newSelection = item->isSelected();
     if (newSelection != HomologySelection[i]){

src/UIElements/Views/Qt4/QtHomologyList.hpp

@@ -15 +15 @@
 
 
-#include <QtGui/QTreeWidget>
+#include <QtGui/QWidget>
 #include "CodePatterns/Observer/Observer.hpp"
 
 class HomologyGraph;
+class QTreeWidget;
 
-class QtHomologyList: public QTreeWidget, public Observer
+class QtHomologyList: public QWidget, public Observer
 {
   Q_OBJECT
@@ -52 +53 @@
   //!> flag to indicate that we currently clear the view, avoids thread collisions
   bool clearing;
+
+private:
+  QTreeWidget *treewidget;
+  QWidget *widget;
 };