Changes in src/UIElements/Views/Qt4/QtHomologyList.cpp [9bdcc9:e1fe7e]

File:

• src/UIElements/Views/Qt4/QtHomologyList.cpp (modified) (4 diffs)

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -41 +41 @@
 #include <QtGui/QTreeWidget>
 #include <QtGui/QTabWidget>
-#include <Qt/qsplitter.h>
-#include <Qt/qboxlayout.h>
+#include<Qt/qsplitter.h>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -74 +73 @@
     potentialregistry_enabled(false)
 {
-  QVBoxLayout* layout = new QVBoxLayout(this);
   QSplitter *splitter = new QSplitter (Qt::Horizontal, this );
-  layout->addWidget(splitter);
-
-  // tree widget
   treewidget = new QTreeWidget (splitter);
-  treewidget->setSelectionMode( QTreeWidget::SingleSelection );
-  treewidget->setColumnCount(COLUMNCOUNT);
-  QStringList header;
-  for(int i=0; i<COLUMNCOUNT;++i)
-    header << COLUMNNAMES[i];
-  treewidget->setHeaderLabels(header);
   splitter->addWidget(treewidget);
 
-  // plot widget
 #ifdef HAVE_QWT
   widget = new QSeisPlotPage ("energy", splitter);
@@ -96 +84 @@
 #endif
   splitter->addWidget(widget);
+//  splitter->setStretchFactor(10, 1);
+
+  treewidget->setSelectionMode( QTreeWidget::SingleSelection );
+
+  treewidget->setColumnCount(COLUMNCOUNT);
+  QStringList header;
+        for(int i=0; i<COLUMNCOUNT;++i)
+          header << COLUMNNAMES[i];
+        treewidget->setHeaderLabels(header);
 
         dirty = true;
@@ -201 +198 @@
         const EmpiricalPotential &potential = dynamic_cast<const EmpiricalPotential &>(**potiter);
         const std::string potentialname = potential.getName();
-        const FunctionModel::filter_t filter = potential.getSpecificFilter();
         Coordinator::ptr coordinator = potential.getCoordinator();
         // then we need to sample the potential
         xvalues.clear();
         for (TrainingData::InputVector_t::const_iterator inputiter = inputs.begin();
-            inputiter != inputs.end(); ++inputiter) {
-          const FunctionModel::list_of_arguments_t specificargs = filter(*inputiter);
-          double average = 0.;
-          for (FunctionModel::list_of_arguments_t::const_iterator argiter = specificargs.begin();
-              argiter != specificargs.end(); ++argiter) {
-            const FunctionModel::arguments_t args = *argiter;
-            average += (*coordinator)(args);
-          }
-          if (specificargs.size() > 1) {
-            const size_t index =  xvalues.size();
-            xvalues.push_back(average/(double)specificargs.size());
-            yvalues[index] *= 1./(double)specificargs.size();
-          }
-        }
-
-        // We need to sort the xvalues (and associated yvalues also)
+            inputiter != inputs.end(); ++inputiter)
+          xvalues.push_back((*coordinator)(*inputiter));
+
+        // We need to sort the xvalues (and yvalues also)
         std::vector<double>::const_iterator xiter = xvalues.begin();
         std::vector<double>::const_iterator yiter = yvalues.begin();