Changeset a08d3c0


Ignore:
Timestamp:
Oct 6, 2011, 3:05:56 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:
04f017
Parents:
da8f97
git-author:
Frederik Heber <heber@…> (08/26/11 14:49:14)
git-committer:
Frederik Heber <heber@…> (10/06/11 15:05:56)
Message:

Replaced empty GLWordlView QWidget by TeapotView example from Qt3d.

  • this completes the initial test for a QGLView derived class.
Location:
src/UIElements
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/UIElements/Makefile.am

    rda8f97 ra08d3c0  
    191191  UIElements/Views/Qt4/QtMoleculeView.cpp \
    192192  UIElements/Views/Qt4/QtStatusBar.cpp \
    193   UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
    194 
     193        UIElements/Views/Qt4/teapotview.cpp
     194#  UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
     195
     196#  UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp \
     197  UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp \
     198  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp \
     199  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp \
     200  UIElements/Views/Qt4/Qt3D/GLMoleculeScene.cpp
    195201#  UIElements/Views/Qt4/dialoglight.cpp
    196202             
     
    218224  UIElements/Views/Qt4/QtMoleculeView.hpp \
    219225  UIElements/Views/Qt4/QtStatusBar.hpp \
    220   UIElements/Views/Qt4/Qt3D/GLWorldView.hpp
     226        UIElements/Views/Qt4/teapotview.hpp
     227#  UIElements/Views/Qt4/Qt3D/GLWorldView.hpp
     228
     229#  UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp \
     230        UIElements/Views/Qt4/Qt3D/GLMoleculeObject.hpp \
     231  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp \
     232  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp \
     233  UIElements/Views/Qt4/Qt3D/GLMoleculeScene.hpp
    221234
    222235#QTUIUI_HEADER = \
  • src/UIElements/Qt4/QtMainWindow.cpp

    rda8f97 ra08d3c0  
    3131#include<boost/bind.hpp>
    3232
     33#include "Menu/Qt4/QtMenu.hpp"
     34#include "Views/Qt4/QtWorldView.hpp"
     35#include "Views/Qt4/QtMoleculeView.hpp"
     36#include "Views/Qt4/QtStatusBar.hpp"
     37#include "Views/Qt4/teapotview.hpp"
     38
    3339#include "CodePatterns/MemDebug.hpp"
    3440
     
    3945#include "Actions/ActionRegistry.hpp"
    4046#include "Actions/ValueStorage.hpp"
    41 #include "Menu/Qt4/QtMenu.hpp"
    42 #include "Views/Qt4/QtWorldView.hpp"
    43 #include "Views/Qt4/QtMoleculeView.hpp"
    44 #include "Views/Qt4/QtStatusBar.hpp"
    45 #include "Views/Qt4/Qt3D/GLWorldView.hpp"
    4647
    4748QtMainWindow::QtMainWindow(QApplication *_theApp) :
     
    5455
    5556  moleculeDisplay = new QtMoleculeView();
    56   molecule3dDisplay = new GLWorldView(this);
     57  molecule3dDisplay = new TeapotView(this);
    5758  //setCentralWidget(molecule3dDisplay);
    5859  //molecule3dDisplay->setFocus();
  • src/UIElements/Qt4/QtMainWindow.hpp

    rda8f97 ra08d3c0  
    2525class QtWorldView;
    2626class StringView;
    27 class GLWorldView;
     27//class GLWorldView;
     28class TeapotView;
    2829class QtMoleculeView;
    2930class QtStatusBar;
     
    4445  QApplication *theApp;
    4546  QtWorldView *worldDisplay;
    46   GLWorldView *molecule3dDisplay;
     47  TeapotView *molecule3dDisplay;
    4748  QtMoleculeView *moleculeDisplay;
    4849  QtStatusBar *statusBar;
Note: See TracChangeset for help on using the changeset viewer.