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 remote branch 'origin/Doc_update_ver741' into V7_5_BR
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_ViewModel.h
diff --git
a/src/OCCViewer/OCCViewer_ViewModel.h
b/src/OCCViewer/OCCViewer_ViewModel.h
index 20ee49e6df319dc00ff54b6166c4a6bb00ff46ef..685e362b029a80e8950426bd7e7f0fa16589115f 100755
(executable)
--- a/
src/OCCViewer/OCCViewer_ViewModel.h
+++ b/
src/OCCViewer/OCCViewer_ViewModel.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-36,7
+36,6
@@
#include <V3d_View.hxx>
#include <AIS_Trihedron.hxx>
#include <AIS_InteractiveContext.hxx>
#include <V3d_View.hxx>
#include <AIS_Trihedron.hxx>
#include <AIS_InteractiveContext.hxx>
-#include <Basics_OCCTVersion.hxx>
#include <Graphic3d_SequenceOfHClipPlane.hxx>
class QKeyEvent;
#include <Graphic3d_SequenceOfHClipPlane.hxx>
class QKeyEvent;
@@
-46,6
+45,7
@@
class SUIT_ViewWindow;
class SUIT_Desktop;
class OCCViewer_ClippingDlg;
class OCCViewer_ViewWindow;
class SUIT_Desktop;
class OCCViewer_ClippingDlg;
class OCCViewer_ViewWindow;
+class OCCViewer_ViewPort3d;
class AIS_ListOfInteractive;
class AIS_ListOfInteractive;
@@
-114,8
+114,9
@@
public:
bool trihedronRelative() const {return myIsRelative; }
bool trihedronRelative() const {return myIsRelative; }
- // a utility function, used by SALOME_View_s methods
+ // a utility function
s
, used by SALOME_View_s methods
bool computeTrihedronSize( double& theNewSize, double& theSize );
bool computeTrihedronSize( double& theNewSize, double& theSize );
+ virtual double computeSceneSize(const Handle(V3d_View)&) const;
void updateTrihedron();
void updateTrihedron();
@@
-124,9
+125,6
@@
public:
public:
Handle(V3d_Viewer) getViewer3d() const { return myV3dViewer;}
public:
Handle(V3d_Viewer) getViewer3d() const { return myV3dViewer;}
-#if OCC_VERSION_LARGE <= 0x06060000
- Handle(V3d_Viewer) getCollector3d() const { return myV3dCollector; }
-#endif
Handle(AIS_InteractiveContext) getAISContext() const { return myAISContext; }
Handle(AIS_Trihedron) getTrihedron() const { return myTrihedron; }
Handle(AIS_InteractiveContext) getAISContext() const { return myAISContext; }
Handle(AIS_Trihedron) getTrihedron() const { return myTrihedron; }
@@
-151,10
+149,10
@@
public:
int getSelectionCount() const { return (!myAISContext.IsNull())? myAISContext->NbSelected():0; }
int getSelectionCount() const { return (!myAISContext.IsNull())? myAISContext->NbSelected():0; }
- bool isStaticTrihedronDisplayed() { return myShowStaticTrihedron; }
void setStaticTrihedronDisplayed(const bool on);
/* Clip planes management */
void setStaticTrihedronDisplayed(const bool on);
/* Clip planes management */
+ Handle(Graphic3d_ClipPlane) createClipPlane(const gp_Pln& thePlane, const Standard_Boolean theIsOn);
void setClipPlanes (ClipPlanesList theList);
ClipPlanesList getClipPlanes() const;
void applyExistingClipPlanesToObject (const Handle(AIS_InteractiveObject)& theObject);
void setClipPlanes (ClipPlanesList theList);
ClipPlanesList getClipPlanes() const;
void applyExistingClipPlanesToObject (const Handle(AIS_InteractiveObject)& theObject);
@@
-186,8
+184,8
@@
protected slots:
virtual void onMouseMove(SUIT_ViewWindow*, QMouseEvent*);
virtual void onMouseRelease(SUIT_ViewWindow*, QMouseEvent*);
virtual void onKeyPress(SUIT_ViewWindow*, QKeyEvent*);
virtual void onMouseMove(SUIT_ViewWindow*, QMouseEvent*);
virtual void onMouseRelease(SUIT_ViewWindow*, QMouseEvent*);
virtual void onKeyPress(SUIT_ViewWindow*, QKeyEvent*);
- virtual void onViewClosed();
- virtual void onViewMapped();
+ virtual void onViewClosed(
OCCViewer_ViewPort3d*
);
+ virtual void onViewMapped(
OCCViewer_ViewPort3d*
);
void onDumpView();
void onChangeBackground();
void onDumpView();
void onChangeBackground();
@@
-195,11
+193,6
@@
protected slots:
protected:
Handle(V3d_Viewer) myV3dViewer;
protected:
Handle(V3d_Viewer) myV3dViewer;
-#if OCC_VERSION_LARGE <= 0x06060000
- Handle(V3d_Viewer) myV3dCollector;
-#endif
-
-
Handle(AIS_Trihedron) myTrihedron;
Handle(AIS_InteractiveContext) myAISContext;
Handle(AIS_Trihedron) myTrihedron;
Handle(AIS_InteractiveContext) myAISContext;
@@
-216,8
+209,6
@@
protected:
//QColor myBgColor;
QPoint myStartPnt, myEndPnt, myCurPnt;
//QColor myBgColor;
QPoint myStartPnt, myEndPnt, myCurPnt;
- bool myShowStaticTrihedron;
-
double myTrihedronSize;
QVector<Qtx::BackgroundData> myBackgrounds;
double myTrihedronSize;
QVector<Qtx::BackgroundData> myBackgrounds;