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
0023124: EDF 11219 GEOM: Ray tracing in the OCC viewer
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_ViewPort3d.h
diff --git
a/src/OCCViewer/OCCViewer_ViewPort3d.h
b/src/OCCViewer/OCCViewer_ViewPort3d.h
index cd8b1c9e1c945603967a4f1af48ef0fb92d294d9..1413b76e9eb1363d20ed3a0b47ea71d022ad4f5e 100755
(executable)
--- a/
src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/
src/OCCViewer/OCCViewer_ViewPort3d.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-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,10
+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 vpMapped();
+ void vpClosed(
OCCViewer_ViewPort3d*
);
+ void vpMapped(
OCCViewer_ViewPort3d*
);
public slots:
virtual bool synchronize( OCCViewer_ViewPort* );
public slots:
virtual bool synchronize( OCCViewer_ViewPort* );
@@
-117,6
+122,7
@@
private:
bool setWindow( const Handle(V3d_View)& );
bool mapped( const Handle(V3d_View)& ) const;
void updateBackground();
bool setWindow( const Handle(V3d_View)& );
bool mapped( const Handle(V3d_View)& ) const;
void updateBackground();
+ void setDefaultParams();
private:
Handle(V3d_View) myActiveView;
private:
Handle(V3d_View) myActiveView;
@@
-130,6
+136,7
@@
private:
Qtx::BackgroundData myBackground;
int myBgImgHeight;
int myBgImgWidth;
Qtx::BackgroundData myBackground;
int myBgImgHeight;
int myBgImgWidth;
+ QCursor* myCursor;
};
#ifdef WIN32
};
#ifdef WIN32