Changeset f20fa5 for src

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:

59a28e

Parents:

0e6156

git-author:

Michael Ankele <ankele@…> (03/08/12 10:08:44)

git-committer:

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

Message:

made QtElementList a QTreeWidget

Location:

src/UIElements/Views/Qt4

Files:

• QtElementList.cpp (modified) (2 diffs)
• QtElementList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtElementList.cpp

@@ -38 +38 @@
 
 QtElementList::QtElementList(QWidget * _parent) :
-    QTableWidget (_parent),
+    QTreeWidget (_parent),
     Observer("QtElementList")
 {
-        setColumnCount(COLUMNCOUNT);
+  setColumnCount(COLUMNCOUNT);
 
-        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);
+        //setAllColumnsShowFocus( true );
 
         molecules = World::getInstance().getMolecules();
@@ -54 +53 @@
         update(molecules);
 
-  setRowCount(20);
   periodentafel *&periode = World::getInstance().getPeriode();
-  //for(periodentafel::iterator it = periode->begin(); it < periode->end(); it ++){}
 
-  int i=0;
-  for (int ni=1;ni<200;ni++){
-    const element *e = periode->FindElement(ni);
-    if (e){
 
-      QTableWidgetItem *indexWidget = new QTableWidgetItem();
-      //std::cout << "Creating index item " << indexWidget << "." << std::endl;
-      indexWidget->setText(QString::number(e->getAtomicNumber()));
-      indexWidget->setData(Qt::UserRole,QVariant(e->getAtomicNumber()));
-      setVerticalHeaderItem(i,indexWidget);
+  int i;
+  periodentafel::const_iterator iter;
+  for(iter = periode->begin(),i=0;
+      iter != periode->end();
+      ++i,++iter) {
+    const element *e = iter->second;
 
-      const string name = e->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);
+    QTreeWidgetItem *treeItem = new QTreeWidgetItem(this);
+    treeItem->setText(0, QString::number(e->getAtomicNumber()));
+    treeItem->setText(1, QString(e->getName().c_str()));
+    treeItem->setText(2, QString(e->getSymbol().c_str()));
+    treeItem->setText(3, QString::number(e->getMass()));
 
-      const string symbol = e->getSymbol();
-      QTableWidgetItem *symWidget = new QTableWidgetItem();
-      //std::cout << "Creating name item " << nameWidget << " at " << i << "," << NAME << "." << std::endl;
-      symWidget->setText(QString(symbol.c_str()));
-      setItem(i,SYMBOL,symWidget);
+    /*QTableWidgetItem *indexWidget = new QTableWidgetItem();
+    //std::cout << "Creating index item " << indexWidget << "." << std::endl;
+    indexWidget->setText(QString::number(e->getAtomicNumber()));
+    indexWidget->setData(Qt::UserRole,QVariant(e->getAtomicNumber()));
+    setItem(i,NUMBER,indexWidget);
 
-      const double mass = e->getMass();
-      QTableWidgetItem *massWidget= new QTableWidgetItem();
-      //std::cout << "Creating count item " << countWidget << " at " << i << "," << ATOMCOUNT << "." << std::endl;
-      massWidget->setText(QString::number(mass));
-      massWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-      setItem(i,MASS,massWidget);
+    const string name = e->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);
 
-      i ++;
-    }
+    const string symbol = e->getSymbol();
+    QTableWidgetItem *symWidget = new QTableWidgetItem();
+    //std::cout << "Creating symbol item " << symWidget << " at " << i << "," << NAME << "." << std::endl;
+    symWidget->setText(QString(symbol.c_str()));
+    setItem(i,SYMBOL,symWidget);
+
+    const double mass = e->getMass();
+    QTableWidgetItem *massWidget= new QTableWidgetItem();
+    //std::cout << "Creating mass item " << massWidget << " at " << i << "," << ATOMCOUNT << "." << std::endl;
+    massWidget->setText(QString::number(mass));
+    massWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+    setItem(i,MASS,massWidget);*/
   }
 

src/UIElements/Views/Qt4/QtElementList.hpp

@@ -15 +15 @@
 
 
-#include <QtGui/QTableWidget>
+#include <QtGui/QTreeWidget>
 #include "CodePatterns/Observer/Observer.hpp"
 
@@ -21 +21 @@
 class MoleculeListClass;
 
-class QtElementList: public QTableWidget, public Observer
+class QtElementList: public QTreeWidget, public Observer
 {
   Q_OBJECT