Changeset 15c8a9 for src/UIElements/Qt4
- Timestamp:
- Feb 12, 2016, 11:15:06 PM (9 years ago)
- 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:
- 47f0e4
- Parents:
- 026bef
- git-author:
- Frederik Heber <heber@…> (10/17/15 15:42:17)
- git-committer:
- Frederik Heber <heber@…> (02/12/16 23:15:06)
- Location:
- src/UIElements/Qt4
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/UIElements/Qt4/QtMainWindow.cpp
r026bef r15c8a9 58 58 #include "Views/Qt4/QtFragmentList.hpp" 59 59 #include "Views/Qt4/QtHomologyList.hpp" 60 #include "Views/Qt4/QtInstanceInformationBoard.hpp" 60 61 #include "Views/Qt4/QtLogBox.hpp" 61 62 #include "Views/Qt4/QtShapeController.hpp" … … 68 69 69 70 #include "CodePatterns/MemDebug.hpp" 71 #include "CodePatterns/Verbose.hpp" 70 72 71 73 #include "Atom/atom.hpp" 72 74 #include "molecule.hpp" 73 #include "CodePatterns/Verbose.hpp"74 75 #include "Actions/Action.hpp" 75 76 #include "Actions/ActionQueue.hpp" … … 95 96 QCoreApplication::setOrganizationDomain("ins.uni-bonn.de"); 96 97 QCoreApplication::setApplicationName("MoleCuilder"); 98 99 InstanceBoard = new QtInstanceInformationBoard(this); 100 97 101 QSplitter *splitter1 = new QSplitter (Qt::Horizontal, this ); 98 102 QSplitter *splitter2 = new QSplitter (Qt::Vertical, splitter1 ); … … 118 122 119 123 infoBox = new QtInfoBox(); 120 glWorldView = new GLWorldView( this);124 glWorldView = new GLWorldView(InstanceBoard, this); 121 125 glWorldView->setSizePolicy( QSizePolicy::Expanding,QSizePolicy::Expanding); 122 126 glWorldView->setMinimumSize( QSize(640,480) ); -
src/UIElements/Qt4/QtMainWindow.hpp
r026bef r15c8a9 23 23 #include "Menu/Qt4/QtMenu.hpp" 24 24 25 #include "types.hpp" 26 25 27 class QtElementList; 26 28 class QtFragmentList; … … 37 39 class QCloseEvent; 38 40 class QSlider; 41 42 class QtInstanceInformationBoard; 39 43 40 44 class QtMainWindow : public QMainWindow, public MainWindow … … 69 73 QtLogBox *logBox; 70 74 75 QtInstanceInformationBoard *InstanceBoard; 71 76 }; 72 77
Note:
See TracChangeset
for help on using the changeset viewer.