Changeset 27e464 for src/UIElements


Ignore:
Timestamp:
Jan 29, 2015, 7:38:10 AM (11 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, Candidate_v1.7.0, Candidate_v1.7.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:
7912e9, eea0bb
Parents:
0ac85c3 (diff), 2050b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'Refactoring_QtMoleculeList_as_QModel' into Candidate_v1.4.10

Location:
src/UIElements
Files:
13 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Makefile.am

    r0ac85c3 r27e464  
    167167  UIElements/Qt4/QtDialog.cpp \
    168168  UIElements/Qt4/QtUIFactory.cpp \
     169  UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.cpp \
     170  UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.cpp \
     171  UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp \
     172  UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.cpp \
    169173  UIElements/Menu/Qt4/QtMenuPipe.cpp \
    170174  UIElements/Views/Qt4/QtElementList.cpp \
    … …  
    173177  UIElements/Views/Qt4/QtInfoBox.cpp \
    174178  UIElements/Views/Qt4/QtLogBox.cpp \
    175   UIElements/Views/Qt4/QtMoleculeList.cpp \
    176179  UIElements/Views/Qt4/QtShapeController.cpp \
    177180  UIElements/Views/Qt4/QtShapeList.cpp \
    … …  
    195198  UIElements/Menu/Qt4/QMenu_tooltip.hpp \
    196199  UIElements/Menu/Qt4/QtMenuPipe.hpp \
    197   UIElements/Views/Qt4/QDebugStream.hpp \
     200  UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp \
     201  UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.hpp \
    198202  UIElements/Views/Qt4/QtElementList.hpp \
    199203  UIElements/Views/Qt4/QtFragmentList.hpp \
    … …  
    201205  UIElements/Views/Qt4/QtInfoBox.hpp \
    202206  UIElements/Views/Qt4/QtLogBox.hpp \
    203   UIElements/Views/Qt4/QtMoleculeList.hpp \
    204207  UIElements/Views/Qt4/QtShapeController.hpp \
    205208  UIElements/Views/Qt4/QtShapeList.hpp \
    … …  
    224227  UIElements/Menu/Qt4/QtMenu.hpp \
    225228  UIElements/Qt4/Query/QtQueryList.hpp \
    226   UIElements/Qt4/QtUIFactory.hpp
     229  UIElements/Qt4/QtUIFactory.hpp \
     230  UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp \
     231  UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.hpp \
     232  UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_atomcount.hpp \
     233  UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_formula.hpp \
     234  UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_name.hpp \
     235  UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_occurrence.hpp \
     236  UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_visibility.hpp \
     237  UIElements/Views/Qt4/QDebugStream.hpp
    227238
    228239lib_LTLIBRARIES += libMolecuilderUI.la

  • src/UIElements/Qt4/QtMainWindow.cpp

    r0ac85c3 r27e464  
    5353
    5454#include "Menu/Qt4/QtMenu.hpp"
    55 #include "Views/Qt4/QtMoleculeList.hpp"
     55#include "Views/Qt4/MoleculeList/QtMoleculeList.hpp"
     56#include "Views/Qt4/MoleculeList/QtMoleculeListView.hpp"
    5657#include "Views/Qt4/QtElementList.hpp"
    5758#include "Views/Qt4/QtFragmentList.hpp"
    … …  
    9596  QVBoxLayout *layout = new QVBoxLayout(layoutwidget);
    9697
    97   moleculeList = new QtMoleculeList(worldTab);
     98  QtMoleculeListView *moleculeListView = new QtMoleculeListView(worldTab);
     99  moleculeList = new QtMoleculeList;
     100  moleculeListView->setModel(moleculeList);
     101
    98102  elementList = new QtElementList(worldTab);
    99103  homologyList = new QtHomologyList(worldTab);
    … …  
    129133  layout->addWidget(worldTab);
    130134  splitter2->addWidget(layoutwidget);
    131   worldTab->addTab(moleculeList, "Molecules");
     135  worldTab->addTab(moleculeListView, "Molecules");
    132136  worldTab->addTab(elementList, "All Elements");
    133137  worldTab->addTab(fragmentList, "All Fragments");
Note: See TracChangeset for help on using the changeset viewer.