Changeset 5a9f4c for src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp

Timestamp:

Sep 10, 2014, 7:10:27 PM (10 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:

55736b

Parents:

2b7375

git-author:

Frederik Heber <heber@…> (09/07/14 18:27:04)

git-committer:

Frederik Heber <heber@…> (09/10/14 19:10:27)

Message:

Removed lots of commented-out code from GLWorldView.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp

@@ -126 +126 @@
 };
 
-
-
-//#include "CodePatterns/Observer/Observer.hpp"
-//#include "LinearAlgebra/Vector.hpp"
-//#include "changetypes.hpp"
-//
-//class atom;
-//class element;
-//class molecule;
-//
-//class GLMoleculeView : public QGLWidget, public Observer
-//{
-//    Q_OBJECT
-//
-//public:
-//
-//    GLMoleculeView( QWidget* parent);
-//    ~GLMoleculeView();
-//
-//public slots:
-//
-//    void    setXRotation( int degrees );
-//    void    setYRotation( int degrees );
-//    void    setZRotation( int degrees );
-//    void    setScale( int distance );
-//    void    setLightPosition( int *light );
-//    void    setLightDiffuse( int *light );
-//    void    setLightAmbient( int *light );
-//    void    createDialogLight();
-//    void    toggleMultiViewEnabled();
-//
-//    void    init( QLabel *ptr );
-//    void    initCoordinates(QLabel *ptr);
-//    void    createView();
-//    void    hearMoleculeSelected(molecule *mol);
-//    void    hearAtomSelected(molecule *mol, atom *Walker);
-//    void    hearMoleculeChanged(molecule *mol, enum ChangesinMolecule type);
-//    void    hearAtomChanged(molecule *mol, atom *Walker, enum ChangesinAtom type);
-//    void    hearElementChanged(element *Runner, enum ChangesinElement type);
-//    void    hearMoleculeAdded(molecule *mol);
-//    void    hearAtomAdded(molecule *mol, atom *Walker);
-//    void    hearMoleculeRemoved(molecule *mol);
-//    void    hearAtomRemoved(molecule *mol, atom *Walker);
-//
-//signals:
-//    void    notifyMoleculeSelected( molecule *mol );
-//    void    notifyAtomSelected( molecule *mol, atom *Walker );
-//    void    notifyMoleculeChanged( molecule *mol, enum ChangesinMolecule type );
-//    void    notifyAtomChanged( molecule *mol, atom *Walker, enum ChangesinAtom type );
-//    void    notifyElementChanged( element *Runner, enum ChangesinElement type );
-//    void    notifyMoleculeAdded( molecule *mol);
-//    void    notifyElementAdded( element *Runner);
-//    void    notifyAtomAdded( molecule *mol, atom *Walker );
-//    void    notifyMoleculeRemoved( molecule *mol );
-//    void    notifyAtomRemoved( molecule *mol, atom *Walker );
-//
-//protected:
-//
-//    void    initializeGL();
-//    void    paintGL();
-//    void    resizeGL( int w, int h );
-//    void    makeSphere(const Vector &x, double radius, const unsigned char color[3]);
-//    void    makeCylinder(const Vector &x, const Vector &y, double radius, double height, const unsigned char color[3]);
-//    void mousePressEvent(QMouseEvent* event);
-//    void mouseReleaseEvent(QMouseEvent* event);
-//
-//public:
-//
-//    /** Update function as we are an Observer.
-//     *
-//     * @param publisher ref to Observable
-//     */
-//    void update(Observable *publisher);
-//
-//    /**
-//     * This method is called when a special named change
-//     * of the Observable occured
-//     */
-//    void recieveNotification(Observable *publisher, Notification_ptr notification);
-//
-//    /**
-//     * This method is called when the observed object is destroyed.
-//     */
-//    void subjectKilled(Observable *publisher);
-//
-//
-//private:
-//
-//    typedef std::map< size_t, node > AtomNodeMap;
-//    typedef std::map< std::pair< size_t, size_t> , node > BondNodeMap;
-//    typedef std::map< size_t, QGLMaterial *> ElementMaterialMap;
-//
-//    ElementMaterialMap ElementNoMaterialMap;
-//    AtomNodeMap AtomsinSceneMap;
-//    BondNodeMap BondsinSceneMap;
-//
-//    QGLMaterial* getMaterial(size_t);
-//    QGLSceneNode* getAtom(size_t);
-//    QGLSceneNode* getBond(size_t, size_t);
-//
-//    // old stuff
-//
-//    GLuint object;  // call list for the scene to be rendered
-//    GLfloat xRot, yRot, zRot, scale;  // rotation angles and scaling (zoom)
-//    Vector position;  //!< position of observer
-//    Vector view;      //!< point along line of view
-//    Vector top;       //!< giving upwards direction
-//    Vector X,Y,Z;     //!< vectors defining the coordinate system
-//    int width;        //!< width of window
-//    int height;       //!< height of window
-//
-//  QLabel *StatusBar;  //!< pointer to status bar for messages
-//  QLabel *CoordinatesBar; //!< pointer to coordinates bar for view port
-//
-//  GLfloat LightPosition[4];        //!< Light Position
-//  GLfloat LightDiffuse[4];         //!< Diffuse Light Values
-//  GLfloat LightAmbient[4];        //!< Ambient Light Values
-//
-//  QPoint LeftButtonPos;     //!< mouse position on mousePressEvent for LeftButton
-//  QPoint MiddleButtonPos;   //!< mouse position on mousePressEvent for MidButton
-//  QPoint RightButtonPos;    //!< mouse position on mousePressEvent for RightButton
-//
-//  unsigned char SelectionColor[3] ; //!< highlight color
-//
-//  bool isSignaller;
-//
-//  bool MultiViewEnabled;    //!< if true, split screen into four parts with additional xy,xz,yz views
-//};
-
 #endif /* GLWORLDVIEW_HPP_ */