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 'V8_3_asterstudy' into V8_3_BR
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_ViewPort3d.h
diff --git
a/src/OCCViewer/OCCViewer_ViewPort3d.h
b/src/OCCViewer/OCCViewer_ViewPort3d.h
index 7f8841a25e2523ca88716d8f86f00d4af86dc1eb..99428489804e23f294917cd1d090782ed98f5f5f 100755
(executable)
--- a/
src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/
src/OCCViewer/OCCViewer_ViewPort3d.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-29,13
+29,12
@@
#include "Qtx.h"
#include <V3d_View.hxx>
#include "Qtx.h"
#include <V3d_View.hxx>
+#include <V3d_Viewer.hxx>
class QColor;
class QString;
class QRect;
class QColor;
class QString;
class QRect;
-class Handle(V3d_Viewer);
-
#ifdef WIN32
#pragma warning ( disable:4251 )
#endif
#ifdef WIN32
#pragma warning ( disable:4251 )
#endif
@@
-66,8
+65,10
@@
public:
// void setActive( V3d_TypeOfView );
virtual bool syncronize( const OCCViewer_ViewPort3d* );
// void setActive( V3d_TypeOfView );
virtual bool syncronize( const OCCViewer_ViewPort3d* );
+#if OCC_VERSION_LARGE <= 0x07000000
double getZSize() const;
void setZSize( double );
double getZSize() const;
void setZSize( double );
+#endif
void getAxialScale( double&, double&, double& );
void getAxialScale( double&, double&, double& );
@@
-94,8
+95,6
@@
public:
void showStaticTrihedron( bool );
void showStaticTrihedron( bool );
- //void repaintViewAfterMove( );
-
void setDefaultCursor( Qt::CursorShape theCursorShape );
QCursor* getDefaultCursor() const;
void setDefaultCursor( Qt::CursorShape theCursorShape );
QCursor* getDefaultCursor() const;
@@
-107,6
+106,9
@@
signals:
public slots:
virtual bool synchronize( OCCViewer_ViewPort* );
public slots:
virtual bool synchronize( OCCViewer_ViewPort* );
+private slots:
+ void repaintViewAfterMove();
+
protected:
// EVENTS
virtual void paintEvent( QPaintEvent* );
protected:
// EVENTS
virtual void paintEvent( QPaintEvent* );
@@
-122,6
+124,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;