Changeset 79b59b for src/UIElements/Views

Timestamp:

Apr 6, 2012, 11:57:19 AM (13 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:

818201

Parents:

575343

git-author:

Michael Ankele <ankele@…> (03/22/12 12:27:01)

git-committer:

Frederik Heber <heber@…> (04/06/12 11:57:19)

Message:

made QtWorldView a QTreeWidget

Location:

src/UIElements/Views/Qt4

Files:

• QtWorldView.cpp (modified) (7 diffs)
• QtWorldView.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/QtWorldView.cpp

@@ -36 +36 @@
 // these attributes are skiped so far
 const int QtWorldView::COLUMNCOUNT = COLUMNTYPES_MAX;
-const char *QtWorldView::COLUMNNAMES[QtWorldView::COLUMNCOUNT]={"Name","Atoms","Formula"/*,"Size"*/};
+const char *QtWorldView::COLUMNNAMES[QtWorldView::COLUMNCOUNT]={"Name","Atoms","Formula","Occurrence"/*,"Size"*/};
 
 QtWorldView::QtWorldView(QWidget * _parent) :
-  QTableWidget (_parent),
+  QTreeWidget (_parent),
   Observer("QtWorldView")
 {
-  setRowCount(0);
   setColumnCount(COLUMNCOUNT);
+  setSelectionMode(QAbstractItemView::MultiSelection);
 
-  for(int i=0; i<COLUMNCOUNT;++i) {
-    QTableWidgetItem *heading = new QTableWidgetItem();
-    std::cout << "Creating heading item " << heading << "." << std::endl;
-    heading->setText(QString(COLUMNNAMES[i]));
-    setHorizontalHeaderItem(i,heading);
-  }
+  QStringList header;
+  for(int i=0; i<COLUMNCOUNT;++i)
+    header << COLUMNNAMES[i];
+  setHeaderLabels(header);
 
   molecules = World::getInstance().getMolecules();
@@ -56 +54 @@
   update(molecules);
 
-  connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
-  connect(this,SIGNAL(cellClicked(int,int)),this,SLOT(cellSelected(int,int)));
+  //connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
+  connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
 
 }
@@ -68 +66 @@
 void QtWorldView::update(Observable *publisher) {
   int numMolecules = molecules->ListOfMolecules.size();
-  setRowCount(numMolecules);
+  clear();
   molSelection.resize(numMolecules);
+
+  // list of (unique) formulas in the world
+  std::vector<Formula> formula;
+
   int i;
   MoleculeList::iterator iter;
@@ -76 +78 @@
       ++i,++iter) {
 
+    // find group if already in list
+    QTreeWidgetItem *groupItem = NULL;
+    for (unsigned int j=0;j<formula.size();j++)
+      if ((*iter)->getFormula() == formula[j]){
+        groupItem = topLevelItem(j);
+        break;
+      }
+
+    // new molecule type -> create new group
+    if (!groupItem){
+      formula.push_back((*iter)->getFormula());
+      groupItem = new QTreeWidgetItem(this);
+      groupItem->setText(0, QString((*iter)->getName().c_str()));
+      groupItem->setText(1, QString::number((*iter)->getAtomCount()));
+      groupItem->setText(2, QString((*iter)->getFormula().toString().c_str()));
+      groupItem->setText(3, "0");
+    }
+
+    // add molecule
+    QTreeWidgetItem *molItem = new QTreeWidgetItem(groupItem);
+    molItem->setText(0, QString((*iter)->getName().c_str()));
+    molItem->setText(1, QString::number((*iter)->getAtomCount()));
+    molItem->setText(2, QString((*iter)->getFormula().toString().c_str()));
     const int index = (*iter)->IndexNr;
-    QTableWidgetItem *indexWidget = new QTableWidgetItem();
-    //std::cout << "Creating index item " << indexWidget << "." << std::endl;
-    indexWidget->setText(QString::number(index));
-    indexWidget->setData(Qt::UserRole,QVariant(index));
-    setVerticalHeaderItem(i,indexWidget);
+    molItem->setData(0, Qt::UserRole, QVariant(index));
 
-    const string name = (*iter)->getName();
-    QTableWidgetItem *nameWidget = new QTableWidgetItem();
-    //std::cout << "Creating name item " << nameWidget << " at " << i << "," << NAME << "." << std::endl;
-    nameWidget->setText(QString(name.c_str()));
-    setItem(i,NAME,nameWidget);
 
-    const int atomCount = (*iter)->getAtomCount();
-    QTableWidgetItem *countWidget= new QTableWidgetItem();
-    //std::cout << "Creating count item " << countWidget << " at " << i << "," << ATOMCOUNT << "." << std::endl;
-    countWidget->setText(QString::number(atomCount));
-    countWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-    setItem(i,ATOMCOUNT,countWidget);
+    // increase group occurrence
+    int count = groupItem->text(3).toInt() + 1;
+    groupItem->setText(3, QString::number(count));
 
-    const Formula formula = (*iter)->getFormula();
-    QTableWidgetItem *formulaWidget= new QTableWidgetItem();
-    //std::cout << "Creating formula item " << formulaWidget << " at " << i << "," << FORMULA << "." << std::endl;
-    formulaWidget->setText(QString(formula.toString().c_str()));
-    formulaWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-    setItem(i,FORMULA,formulaWidget);
-
-    molSelection[i]=nameWidget->isSelected();
+    //molSelection[i]=nameWidget->isSelected();
   }
 }
@@ -110 +116 @@
 }
 
-void QtWorldView::moleculeChanged(int row, int column) {
-  int idx = verticalHeaderItem(row)->data(Qt::UserRole).toInt();
+void QtWorldView::moleculeChanged() {
+  /*int idx = verticalHeaderItem(row)->data(Qt::UserRole).toInt();
   molecule *mol = molecules->ReturnIndex(idx);
   string cellValue = item(row,NAME)->text().toStdString();
@@ -119 +125 @@
   else if(cellValue==""){
     item(row,NAME)->setText(QString(mol->getName().c_str()));
-  }
+  }*/
 }
 
 
-void QtWorldView::cellSelected(int row, int column){
+void QtWorldView::rowSelected(){
   //std::cout << "Selection in (" << row << "," << column << "): " << item(row,column) << std::endl;
-  bool state = item(row,column)->isSelected();
+  /*bool state = item(row,column)->isSelected();
   for(int i = 0; i<COLUMNCOUNT; i++){
     //std::cout << "Setting " << i << "-th item " << item(row,i) << " in row " << row << " to state selected." << std::endl;
@@ -144 +150 @@
       molSelection[i]=state;
     }
-  }
+  }*/
 }

src/UIElements/Views/Qt4/QtWorldView.hpp

@@ -15 +15 @@
 
 
-#include <QtGui/QTableWidget>
+#include <QtGui/QTreeWidget>
 #include "CodePatterns/Observer/Observer.hpp"
 
@@ -21 +21 @@
 class MoleculeListClass;
 
-class QtWorldView : public QTableWidget, public Observer
+class QtWorldView : public QTreeWidget, public Observer
 {
   Q_OBJECT
@@ -34 +34 @@
 
   static const int COLUMNCOUNT;
-  enum {NAME,ATOMCOUNT,FORMULA,COLUMNTYPES_MAX} COLUMNTYPES;
+  enum {NAME,ATOMCOUNT,FORMULA,OCCURRENCE,COLUMNTYPES_MAX} COLUMNTYPES;
   static const char *COLUMNNAMES[];
 
 private slots:
-  void moleculeChanged(int row, int column);
+  void moleculeChanged();
 
-  void cellSelected(int row, int column);
+  void rowSelected();
 
 signals: