Changeset 47812b for src

Timestamp:

Oct 6, 2011, 12:08:30 PM (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:

573d72

Parents:

b40b9d

git-author:

Frederik Heber <heber@…> (08/12/11 16:09:00)

git-committer:

Frederik Heber <heber@…> (10/06/11 12:08:30)

Message:

FIX: MolecuilderGUI crashes on selecting molecule.

• QtWorldView::update() set ATOMS column twice, hence FORMULA was NULL item.
• rename in enum COLUMNTYPES: ATOMS->ATOMCOUNT.

Location:

src/UIElements/Views/Qt4

Files:

• QtWorldView.cpp (modified) (5 diffs)
• QtWorldView.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtWorldView.cpp

@@ -46 +46 @@
   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);
@@ -76 +77 @@
     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));
@@ -82 +84 @@
     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);
@@ -87 +90 @@
     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,ATOMS,countWidget);
+    setItem(i,ATOMCOUNT,countWidget);
 
     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,ATOMS,formulaWidget);
+    setItem(i,FORMULA,formulaWidget);
 
     molSelection[i]=nameWidget->isSelected();
@@ -118 +123 @@
 
 void QtWorldView::cellSelected(int row, int column){
+  //std::cout << "Selection in (" << row << "," << column << "): " << item(row,column) << std::endl;
   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;
     item(row,i)->setSelected(state);
   }

src/UIElements/Views/Qt4/QtWorldView.hpp

@@ -34 +34 @@
 
   static const int COLUMNCOUNT;
-  enum {NAME,ATOMS,FORMULA,COLUMNTYPES_MAX} COLUMNTYPES;
+  enum {NAME,ATOMCOUNT,FORMULA,COLUMNTYPES_MAX} COLUMNTYPES;
   static const char *COLUMNNAMES[];