Changeset 3b1798 for src

Timestamp:

Oct 19, 2014, 5:12:37 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:

0516fd, 4da4de

Parents:

5c8807

git-author:

Frederik Heber <heber@…> (09/19/14 11:19:18)

git-committer:

Frederik Heber <heber@…> (10/19/14 17:12:37)

Message:

FIX: QtHomologyList's plot widget was too high (and fixed).

• also the sizes of splitter's children in QtHomologyList are now stored to settings (as QsizePolicy does not have an effect on a splitter).

Location:

src/UIElements/Views/Qt4

Files:

• Plotting/QSeisPlotPage.cpp (modified) (3 diffs)
• Plotting/QSeisPlotPage.hpp (modified) (3 diffs)
• QtHomologyList.cpp (modified) (6 diffs)

src/UIElements/Views/Qt4/Plotting/QSeisPlotPage.cpp

@@ -25 +25 @@
 
 QSeisPlotPage::QSeisPlotPage(QString type, QWidget *parent) :
-        QWidget(parent), plotType(type)
+        QWidget(parent), 
+        plotType(type), 
+        curveList(NULL),
+        plot (NULL), 
+        layoutInitialized(false)
 {
     //create GUI elements
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    curveList = new QListWidget(this);
-    curveList->setMaximumWidth(250);
-    plot = new QSeisPlot(this,type);
-    layout->addWidget(curveList);
-    layout->addWidget(plot);
+    layout = new QHBoxLayout(this);
     setLayout(layout);
 
-    connect(curveList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(listItemChanged(QListWidgetItem*)));
 }
 
 QSeisPlotPage::~QSeisPlotPage()
 {
+    deinitializeLayout();
+}
 
+void QSeisPlotPage::initializeLayout()
+{
+    curveList = new QListWidget(this);
+    curveList->setMaximumWidth(250);
+    connect(curveList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(listItemChanged(QListWidgetItem*)));
+    plot = new QSeisPlot(this,plotType);
+    plot->setMinimumHeight(10);
+    layout->addWidget(curveList);
+    layout->addWidget(plot);
+    layoutInitialized = true;
+}
+
+void QSeisPlotPage::deinitializeLayout()
+{
+    disconnect(curveList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(listItemChanged(QListWidgetItem*)));
+    layout->removeWidget(curveList);
+    layout->removeWidget(plot);
+    delete curveList;
+    delete plot;
+    layoutInitialized = false;
 }
 
@@ -56 +76 @@
 void QSeisPlotPage::addCurve(std::string name)
 {
+    if (!layoutInitialized)
+      initializeLayout();
+
     QSeisPlotCurve *curve = QSeisCurveRegistry::getInstance().getByName(name);
     QListWidgetCurveItem *item = new QListWidgetCurveItem();
@@ -90 +113 @@
         }
     }
+
+    if (curveList->count() == 0)
+      deinitializeLayout();
 }
 

src/UIElements/Views/Qt4/Plotting/QSeisPlotPage.hpp

@@ -16 +16 @@
 #include <QtGui/QWidget>
 
+class QHBoxLayout;
 class QSeisPlot;
 class QListWidgetItem;
@@ -33 +34 @@
     ~QSeisPlotPage();
     QString plotType;
+    QHBoxLayout *layout;
     QListWidget *curveList;
     QSeisPlot *plot;
@@ -48 +50 @@
     void updateCurve(std::string name);
 
+private:
+    void initializeLayout();
+    void deinitializeLayout();
+    bool layoutInitialized;
 };
 

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -41 +41 @@
 #include <QtGui/QTreeWidget>
 #include <QtGui/QTabWidget>
+#include <Qt/qsettings.h>
 #include <Qt/qsplitter.h>
 #include <Qt/qboxlayout.h>
@@ -74 +75 @@
     potentialregistry_enabled(false)
 {
-  QVBoxLayout* layout = new QVBoxLayout(this);
+  QHBoxLayout* layout = new QHBoxLayout(this);
   QSplitter *splitter = new QSplitter (Qt::Horizontal, this );
   layout->addWidget(splitter);
@@ -82 +83 @@
   treewidget->setSelectionMode( QTreeWidget::SingleSelection );
   treewidget->setColumnCount(COLUMNCOUNT);
+  //treewidget->setSizePolicy( QSizePolicy::Minimum, sizePolicy().verticalPolicy() );
   QStringList header;
   for(int i=0; i<COLUMNCOUNT;++i)
@@ -91 +93 @@
 #ifdef HAVE_QWT
   widget = new QSeisPlotPage ("energy", splitter);
+  //widget->setSizePolicy( QSizePolicy::MinimumExpanding, sizePolicy().verticalPolicy() );
   QSeisPageRegistry::getInstance().registerInstance(widget);
 #else
@@ -97 +100 @@
   splitter->addWidget(widget);
 
-        dirty = true;
+  dirty = true;
   clearing = false;
+  
+  QSettings settings;
+  settings.beginGroup("QtHomologyList");
+  treewidget->resize(settings.value("treewidget_size", QSize(width()/2, 20)).toSize());
+  widget->resize(settings.value("plotwidget_size", QSize(width()/2, 20)).toSize());
+  settings.endGroup();
 
   refill();
@@ -120 +129 @@
 QtHomologyList::~QtHomologyList()
 {
+  QSettings settings;
+  settings.beginGroup("QtHomologyList");
+  settings.setValue("treewidget_size", treewidget->size());
+  settings.setValue("plotwidget_size", widget->size());
+  settings.endGroup();
+
+
   HomologyContainer &homologies = World::getInstance().getHomologies();
   homologies.signOff(this);