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 57b95886608ab00caafb52601b94d77dd857d7c6..7f8841a25e2523ca88716d8f86f00d4af86dc1eb 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
@@
-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"
@@
-61,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* );
@@
-92,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* );
@@
-118,7
+125,7
@@
private:
private:
Handle(V3d_View) myActiveView;
private:
Handle(V3d_View) myActiveView;
-#if OCC_VERSION_LARGE <= 0x06070
0
00
+#if OCC_VERSION_LARGE <= 0x06070
1
00
Handle(V3d_View) myOrthoView;
Handle(V3d_View) myPerspView;
#endif
Handle(V3d_View) myOrthoView;
Handle(V3d_View) myPerspView;
#endif
@@
-128,6
+135,7
@@
private:
Qtx::BackgroundData myBackground;
int myBgImgHeight;
int myBgImgWidth;
Qtx::BackgroundData myBackground;
int myBgImgHeight;
int myBgImgWidth;
+ QCursor* myCursor;
};
#ifdef WIN32
};
#ifdef WIN32