Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hydro/imps_2015' of https://git.salome-platform.org/gitpub/modules...
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_ViewPort3d.h
diff --git
a/src/OCCViewer/OCCViewer_ViewPort3d.h
b/src/OCCViewer/OCCViewer_ViewPort3d.h
index d8287297966393509e56378e23c63fce16853dcd..7f8841a25e2523ca88716d8f86f00d4af86dc1eb 100755
(executable)
--- a/
src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/
src/OCCViewer/OCCViewer_ViewPort3d.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,6
+23,8
@@
#ifndef OCCVIEWER_VIEWPORT3D_H
#define OCCVIEWER_VIEWPORT3D_H
#ifndef OCCVIEWER_VIEWPORT3D_H
#define OCCVIEWER_VIEWPORT3D_H
+#include <Basics_OCCTVersion.hxx>
+
#include "OCCViewer_ViewPort.h"
#include "Qtx.h"
#include "OCCViewer_ViewPort.h"
#include "Qtx.h"
@@
-53,8
+55,6
@@
public:
Handle(V3d_View) setView( const Handle(V3d_View)& );
Handle(V3d_Viewer) getViewer() const;
Handle(V3d_View) setView( const Handle(V3d_View)& );
Handle(V3d_Viewer) getViewer() const;
- void setAnimationMode(bool theDegenerated);
-
virtual void setBackgroundColor( const QColor& color); // obsolete
virtual QColor backgroundColor() const; // obsolete
void setBackground( const Qtx::BackgroundData& color);
virtual void setBackgroundColor( const QColor& color); // obsolete
virtual QColor backgroundColor() const; // obsolete
void setBackground( const Qtx::BackgroundData& color);
@@
-63,8
+63,6
@@
public:
virtual int getBgImgHeight(){return myBgImgHeight; };
virtual int getBgImgWidth() {return myBgImgWidth; };
virtual int getBgImgHeight(){return myBgImgHeight; };
virtual int getBgImgWidth() {return myBgImgWidth; };
- virtual void updateStaticTriedronVisibility();
-
// void setActive( V3d_TypeOfView );
virtual bool syncronize( const OCCViewer_ViewPort3d* );
// void setActive( V3d_TypeOfView );
virtual bool syncronize( const OCCViewer_ViewPort3d* );
@@
-94,9
+92,17
@@
public:
void setAdvancedZoomingEnabled( const bool theState ) { myIsAdvancedZoomingEnabled = theState; }
bool isAdvancedZoomingEnabled() const { return myIsAdvancedZoomingEnabled; }
void setAdvancedZoomingEnabled( const bool theState ) { myIsAdvancedZoomingEnabled = theState; }
bool isAdvancedZoomingEnabled() const { return myIsAdvancedZoomingEnabled; }
+ void showStaticTrihedron( bool );
+
+ //void repaintViewAfterMove( );
+
+ void setDefaultCursor( Qt::CursorShape theCursorShape );
+ QCursor* getDefaultCursor() const;
+
signals:
void vpChangeBackground( const Qtx::BackgroundData& );
signals:
void vpChangeBackground( const Qtx::BackgroundData& );
- void vpClosed();
+ void vpClosed(OCCViewer_ViewPort3d*);
+ void vpMapped(OCCViewer_ViewPort3d*);
public slots:
virtual bool synchronize( OCCViewer_ViewPort* );
public slots:
virtual bool synchronize( OCCViewer_ViewPort* );
@@
-118,17
+124,18
@@
private:
void updateBackground();
private:
void updateBackground();
private:
+ Handle(V3d_View) myActiveView;
+#if OCC_VERSION_LARGE <= 0x06070100
Handle(V3d_View) myOrthoView;
Handle(V3d_View) myPerspView;
Handle(V3d_View) myOrthoView;
Handle(V3d_View) myPerspView;
- Handle(V3d_View) myActiveView;
- bool myDegenerated;
- bool myAnimate;
+#endif
bool myBusy;
double myScale;
bool myIsAdvancedZoomingEnabled;
Qtx::BackgroundData myBackground;
int myBgImgHeight;
int myBgImgWidth;
bool myBusy;
double myScale;
bool myIsAdvancedZoomingEnabled;
Qtx::BackgroundData myBackground;
int myBgImgHeight;
int myBgImgWidth;
+ QCursor* myCursor;
};
#ifdef WIN32
};
#ifdef WIN32