OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0026936: Drawbacks of inlining in new type system in OCCT 7.0 -- automatic

Browse Source 
Automatic restore of IMPLEMENT_STANDARD_RTTIEXT macro (upgrade -rtti)
This commit is contained in:
abv
2015-12-04 14:15:06 +03:00
parent f5f4ebd07b
commit 92efcf78a6
4556 changed files with 7149 additions and 2882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/mfc/standard/04_Viewer3d/src/DlgAttributes.cpp
View File

@@ -76,7 +76,7 @@ END_MESSAGE_MAP()
void DlgAttributes::OnColor()
{
Handle_AIS_InteractiveObject Current ;
Handle(AIS_InteractiveObject) Current ;
Quantity_Color CSFColor ;
COLORREF MSColor ;

2
samples/mfc/standard/04_Viewer3d/src/DlgAttributes.h
View File

@@ -73,7 +73,7 @@ protected:
void SetMaterial (Graphic3d_NameOfMaterial Material);
private:
Handle_AIS_InteractiveContext myAISContext;
Handle(AIS_InteractiveContext) myAISContext;
CResultDialog* myCResultDialog;
};

1
samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp
View File

@@ -10,7 +10,6 @@
#include <Prs3d_Drawer.hxx>
#include <Prs3d_ArrowAspect.hxx>
IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
#ifdef _DEBUG

2
samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h
View File

@@ -20,7 +20,7 @@ class ISession_Curve : public AIS_InteractiveObject
public:
ISession_Curve(const Handle(Geom_Curve)& aCurve);
virtual ~ISession_Curve();
DEFINE_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
private:
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;

30
samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.cpp
View File

@@ -77,8 +77,8 @@ static Standard_Boolean fixParam(Standard_Real& theParam)
// Purpose : displays a given geometric surface in 3d viewer
// (creates a finite face and displays it)
//================================================================
Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
(const Handle_Geom_Surface& theSurface,
Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawSurface
(const Handle(Geom_Surface)& theSurface,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay)
{
@@ -89,7 +89,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
fixParam(v1);
fixParam(v2);
Handle_AIS_Shape aGraphicSurface =
Handle(AIS_Shape) aGraphicSurface =
new AIS_Shape(BRepBuilderAPI_MakeFace (theSurface, u1, u2, v1, v2, Precision::Confusion()));
getAISContext()->SetMaterial(aGraphicSurface, Graphic3d_NOM_PLASTIC, toDisplay);
@@ -110,8 +110,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
// Function : DrawCurve
// Purpose : displays a given curve 3d
//================================================================
Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
(const Handle_Geom_Curve& theCurve,
Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
(const Handle(Geom_Curve)& theCurve,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay)
{
@@ -135,8 +135,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
// Function : DrawCurve
// Purpose : displays a given curve 2d
//================================================================
Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
(const Handle_Geom2d_Curve& theCurve,
Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
(const Handle(Geom2d_Curve)& theCurve,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay,
const gp_Ax2& aPosition)
@@ -163,7 +163,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
// Function : drawPoint
// Purpose : displays a given point
//================================================================
Handle_AIS_Point OCCDemo_Presentation::drawPoint
Handle(AIS_Point) OCCDemo_Presentation::drawPoint
(const gp_Pnt& aPnt,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay)
@@ -185,7 +185,7 @@ Handle_AIS_Point OCCDemo_Presentation::drawPoint
// (segment of line starting at thePnt with the arrow at the end,
// the length of segment is the length of the vector)
//================================================================
Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector
Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawVector
(const gp_Pnt& thePnt,
const gp_Vec& theVec,
const Quantity_Color& theColor,
@@ -217,11 +217,11 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector
}
Handle_AIS_Shape OCCDemo_Presentation::drawShape
Handle(AIS_Shape) OCCDemo_Presentation::drawShape
(const TopoDS_Shape& theShape,const Quantity_Color& theColor,
const Standard_Boolean toDisplay)
{
Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
getAISContext()->SetMaterial(aGraphicShape, Graphic3d_NOM_PLASTIC, toDisplay);
getAISContext()->SetColor (aGraphicShape, theColor, toDisplay);
@@ -237,12 +237,12 @@ Handle_AIS_Shape OCCDemo_Presentation::drawShape
return aGraphicShape;
}
Handle_AIS_Shape OCCDemo_Presentation::drawShape
Handle(AIS_Shape) OCCDemo_Presentation::drawShape
(const TopoDS_Shape& theShape,
const Graphic3d_NameOfMaterial theMaterial,
const Standard_Boolean toDisplay)
{
Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
getAISContext()->SetMaterial(aGraphicShape, theMaterial, toDisplay);
if (toDisplay) {
@@ -313,12 +313,12 @@ void OCCDemo_Presentation::ResetView()
pView->Reset();
}
Handle_AIS_InteractiveContext OCCDemo_Presentation::getAISContext() const
Handle(AIS_InteractiveContext) OCCDemo_Presentation::getAISContext() const
{
return myDoc->GetAISContext();
}
Handle_V3d_Viewer OCCDemo_Presentation::getViewer() const
Handle(V3d_Viewer) OCCDemo_Presentation::getViewer() const
{
return myDoc->GetViewer();
}

18
samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.h
View File

@@ -66,8 +66,8 @@ public:
protected:
// Methods to call from a derivable class
void setName (const char* theName) {myName = CString(theName);}
Handle_AIS_InteractiveContext getAISContext() const;
Handle_V3d_Viewer getViewer() const;
Handle(AIS_InteractiveContext) getAISContext() const;
Handle(V3d_Viewer) getViewer() const;
// void setResultTitle (const char* theTitle) {myDoc->GetResultDialog()->SetTitle(theTitle);}
// void setResultText (const char* theText) {myDoc->GetResultDialog()->SetText(theText);}
Standard_CString GetDataDir();
@@ -75,45 +75,45 @@ protected:
Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
// Waits for a user input or a period of time has been elapsed
Handle_AIS_InteractiveObject drawSurface (const Handle_Geom_Surface& theSurface,
Handle(AIS_InteractiveObject) drawSurface (const Handle(Geom_Surface)& theSurface,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_LEMONCHIFFON3),
const Standard_Boolean toDisplay = Standard_True);
// creates a finite face based on the given geometric surface
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_InteractiveObject drawCurve (const Handle_Geom_Curve& theCurve,
Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom_Curve)& theCurve,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
const Standard_Boolean toDisplay = Standard_True);
// creates an ISession_Curve based on the given geometric curve
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_InteractiveObject drawCurve (const Handle_Geom2d_Curve& theCurve,
Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom2d_Curve)& theCurve,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
const Standard_Boolean toDisplay = Standard_True,
const gp_Ax2& aPosition = gp::XOY());
// converts a given curve to 3d using aPosition and calls the previous method
Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
Handle(AIS_Point) drawPoint (const gp_Pnt& thePnt,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given point
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_InteractiveObject drawVector (const gp_Pnt& thePnt,
Handle(AIS_InteractiveObject) drawVector (const gp_Pnt& thePnt,
const gp_Vec& theVec,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_YELLOW),
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given vector
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given shape
// with material PLASTIC and a given color
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given shape with the given material

2
samples/mfc/standard/04_Viewer3d/src/ScaleDlg.cpp
View File

@@ -14,7 +14,7 @@ static char THIS_FILE[] = __FILE__;
// ScaleDlg dialog
ScaleDlg::ScaleDlg(Handle_V3d_View Current_V3d_View, CViewer3dView* pView, CWnd* pParent /*=NULL*/)
ScaleDlg::ScaleDlg(Handle(V3d_View) Current_V3d_View, CViewer3dView* pView, CWnd* pParent /*=NULL*/)
: CDialog(ScaleDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(ScaleDlg)

4
samples/mfc/standard/04_Viewer3d/src/ScaleDlg.h
View File

@@ -17,7 +17,7 @@ class ScaleDlg : public CDialog
{
// Construction
public:
ScaleDlg(Handle_V3d_View Current_V3d_View, CViewer3dView* pView, CWnd* pParent = NULL);
ScaleDlg(Handle(V3d_View) Current_V3d_View, CViewer3dView* pView, CWnd* pParent = NULL);
// Dialog Data
//{{AFX_DATA(ScaleDlg)
@@ -53,7 +53,7 @@ protected:
private:
Handle_V3d_View myCurrent_V3d_View;
Handle(V3d_View) myCurrent_V3d_View;
CViewer3dView* myView;
};

2
samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.cpp
View File

@@ -15,7 +15,7 @@ static char THIS_FILE[] = __FILE__;
// CShadingModelDlg dialog
CShadingModelDlg::CShadingModelDlg(Handle_V3d_View Current_V3d_View, CWnd* pParent /*=NULL*/)
CShadingModelDlg::CShadingModelDlg(Handle(V3d_View) Current_V3d_View, CWnd* pParent /*=NULL*/)
: CDialog(CShadingModelDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(CShadingModelDlg)

4
samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.h
View File

@@ -16,7 +16,7 @@ class CShadingModelDlg : public CDialog
{
// Construction
public:
CShadingModelDlg(Handle_V3d_View Current_V3d_View, CWnd* pParent = NULL); // standard constructor
CShadingModelDlg(Handle(V3d_View) Current_V3d_View, CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(CShadingModelDlg)
@@ -44,7 +44,7 @@ protected:
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Handle_V3d_View myCurrent_V3d_View;
Handle(V3d_View) myCurrent_V3d_View;
};
//{{AFX_INSERT_LOCATION}}

28
samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
View File

@@ -69,7 +69,7 @@ void TexturesExt_Presentation::Init()
{
// initialize v3d_view so it displays TexturesExt well
getViewer()->InitActiveViews();
Handle_V3d_View aView = getViewer()->ActiveView();
Handle(V3d_View) aView = getViewer()->ActiveView();
aView->SetSurfaceDetail(V3d_TEX_ALL);
aView->SetSize(ZVIEW_SIZE);
@@ -81,7 +81,7 @@ void TexturesExt_Presentation::Init()
" // aShape = ..." EOL
"" EOL
" // create a textured presentation object for aShape" EOL
" Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);" EOL
" Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);" EOL
"" EOL
" TCollection_AsciiString aTFileName;" EOL
"" EOL
@@ -127,7 +127,7 @@ void TexturesExt_Presentation::Init()
// a predefined texture from Graphic3d_NameOfTexture2D with number = this value
// is loaded.
//================================================================
Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape& aShape,
Handle(AIS_TexturedShape) TexturesExt_Presentation::Texturize(const TopoDS_Shape& aShape,
TCollection_AsciiString aTFileName,
Standard_Real toScaleU,
Standard_Real toScaleV,
@@ -137,7 +137,7 @@ Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape&
Standard_Real originV)
{
// create a textured presentation object for aShape
Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);
Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);
TCollection_AsciiString TFileName;
// load texture from file if it is not an integer value
// integer value indicates a number of texture in predefined TexturesExt enumeration
@@ -204,12 +204,12 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape,
//================================================================
void TexturesExt_Presentation::lightsOnOff(Standard_Boolean isOn)
{
static Handle_V3d_Light aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
static Handle_V3d_Light aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
static Handle_V3d_Light aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
static Handle_V3d_Light aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
static Handle_V3d_Light aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
static Handle_V3d_Light aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
static Handle(V3d_Light) aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
static Handle(V3d_Light) aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
static Handle(V3d_Light) aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
static Handle(V3d_Light) aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
static Handle(V3d_Light) aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
static Handle(V3d_Light) aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
if (isOn)
{
@@ -254,16 +254,16 @@ aShape = Transformer.Shape();
TopExp::MapShapes(aShape, TopAbs_FACE, aFaces);
// display original shape in shaded display mode
Handle_AIS_Shape aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
Handle(AIS_Shape) aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
getAISContext()->SetDisplayMode(aShapeIO, AIS_Shaded, Standard_False);
// Set increased polygon offset for the main shape to avoid depth collision with textured faces
aShapeIO->SetPolygonOffsets(Aspect_POM_Fill, 1.5, 0.5);
DISP(aShapeIO);
Handle_AIS_TexturedShape aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
Handle(AIS_TexturedShape) aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
DISP(aTFace1);
Handle_AIS_TexturedShape aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
Handle(AIS_TexturedShape) aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
DISP(aTFace2);
getViewer()->Update();
@@ -285,7 +285,7 @@ void TexturesExt_Presentation::sampleTerrain()
TopExp::MapShapes(aShape, TopAbs_FACE, aFaces);
// TopLoc_Location aLoc;
// Handle_Geom_Surface aSur = BRep_Tool::Surface(TopoDS::Face(aFaces(1)), aLoc);
// Handle(Geom_Surface) aSur = BRep_Tool::Surface(TopoDS::Face(aFaces(1)), aLoc);
// Standard_Real u1,u2,v1,v2;
// aSur->Bounds(u1,u2,v1,v2);
// gp_Pnt aPnt = aSur->Value(u1, v1);

2
samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.h
View File

@@ -32,7 +32,7 @@ private:
// filename can also be an integer value ("2", "5", etc.), in this case
// a predefined texture from Graphic3d_NameOfTexture2D with number = this value
// is loaded.
Handle_AIS_TexturedShape Texturize(
Handle(AIS_TexturedShape) Texturize(
const TopoDS_Shape& aShape, TCollection_AsciiString aTFileName,
Standard_Real toScaleU=1.0, Standard_Real toScaleV=1.0,
Standard_Real toRepeatU=1.0, Standard_Real toRepeatV=1.0,

2
samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp
View File

@@ -35,7 +35,7 @@ value = (value*neg)/inc;
//CTrihedronDlg::CTrihedronDlg(CWnd* pParent /*=NULL*/)
//: CDialog(CTrihedronDlg::IDD, pParent)
CTrihedronDlg::CTrihedronDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
CTrihedronDlg::CTrihedronDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
: CDialog(CTrihedronDlg::IDD, pParent)
{

4
samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.h
View File

@@ -21,7 +21,7 @@ class CTrihedronDlg : public CDialog
// Construction
public:
CTrihedronDlg(CWnd* pParent = NULL); // standard constructor
CTrihedronDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL); // standard constructor
CTrihedronDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL); // standard constructor
// Dialog Data
@@ -63,7 +63,7 @@ protected:
private:
Handle_V3d_View myCurrent_V3d_View;
Handle(V3d_View) myCurrent_V3d_View;
CViewer3dDoc* myDoc;
Quantity_NameOfColor Color ;
Aspect_TypeOfTriedronPosition Position;

16
samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
View File

@@ -445,34 +445,34 @@ void CViewer3dDoc::OnObjectDisplayall()
myOffsetDlg->UpdateValues();
}
Handle_User_Cylinder CViewer3dDoc::GetCylinder()
Handle(User_Cylinder) CViewer3dDoc::GetCylinder()
{
return myCylinder;
}
Handle_AIS_Shape CViewer3dDoc::GetSphere()
Handle(AIS_Shape) CViewer3dDoc::GetSphere()
{
return mySphere;
}
Handle_AIS_Shape CViewer3dDoc::GetBox()
Handle(AIS_Shape) CViewer3dDoc::GetBox()
{
return myBox;
}
Handle_AIS_Shape CViewer3dDoc::GetOverlappedCylinder()
Handle(AIS_Shape) CViewer3dDoc::GetOverlappedCylinder()
{
return myOverlappedCylinder;
}
Handle_AIS_Shape CViewer3dDoc::GetOverlappedSphere()
Handle(AIS_Shape) CViewer3dDoc::GetOverlappedSphere()
{
return myOverlappedSphere;
}
Handle_AIS_Shape CViewer3dDoc::GetOverlappedBox()
Handle(AIS_Shape) CViewer3dDoc::GetOverlappedBox()
{
return myOverlappedBox;
}
@@ -507,7 +507,7 @@ void CViewer3dDoc::InputEvent(const Standard_Integer /*x*/,
myAISContext->InitSelected();
if (myAISContext->MoreSelected())
{
Handle_AIS_InteractiveObject Current = myAISContext->SelectedInteractive();
Handle(AIS_InteractiveObject) Current = myAISContext->SelectedInteractive();
if (Current->HasColor())
{
CSFColor = myAISContext->Color (Current);
@@ -770,7 +770,7 @@ void CViewer3dDoc::OnFillet3d()
myAISContext->InitSelected();
if (myAISContext->MoreSelected())
{
const Handle(AIS_Shape)& aSelInteractive = Handle(AIS_Shape)::DownCast (myAISContext->SelectedInteractive());
Handle(AIS_Shape) aSelInteractive (Handle(AIS_Shape)::DownCast (myAISContext->SelectedInteractive()));
if (aSelInteractive.IsNull())
{
AfxMessageBox (L"It is necessary to activate the edges selection mode\n"

26
samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h
View File

@@ -34,12 +34,12 @@ protected: // create from serialization only
public:
void SetMyStaticTrihedronAxisIsDisplayed(BOOL IsDisplayed);
Handle_AIS_Shape GetBox();
Handle_AIS_Shape GetSphere();
Handle_User_Cylinder GetCylinder();
Handle_AIS_Shape GetOverlappedBox();
Handle_AIS_Shape GetOverlappedSphere();
Handle_AIS_Shape GetOverlappedCylinder();
Handle(AIS_Shape) GetBox();
Handle(AIS_Shape) GetSphere();
Handle(User_Cylinder) GetCylinder();
Handle(AIS_Shape) GetOverlappedBox();
Handle(AIS_Shape) GetOverlappedSphere();
Handle(AIS_Shape) GetOverlappedCylinder();
void Start();
Standard_CString GetDataDir() {return myDataDir;}
static void Fit();
@@ -137,13 +137,13 @@ protected:
private:
COffsetDlg* myOffsetDlg;
Handle_User_Cylinder myCylinder;
Handle_AIS_Shape mySphere;
Handle_AIS_Shape myBox;
Handle_AIS_Shape myOverlappedCylinder;
Handle_AIS_Shape myOverlappedSphere;
Handle_AIS_Shape myOverlappedBox;
Handle_AIS_Trihedron myTrihedron;
Handle(User_Cylinder) myCylinder;
Handle(AIS_Shape) mySphere;
Handle(AIS_Shape) myBox;
Handle(AIS_Shape) myOverlappedCylinder;
Handle(AIS_Shape) myOverlappedSphere;
Handle(AIS_Shape) myOverlappedBox;
Handle(AIS_Trihedron) myTrihedron;
OCCDemo_Presentation *myPresentation;
char myDataDir[5]; // for "Data\0"

4
samples/mfc/standard/04_Viewer3d/src/Viewer3dView.h
View File

@@ -130,8 +130,8 @@ private:
enum VisMode { VIS_WIREFRAME, VIS_SHADE, VIS_HLR };
VisMode myVisMode;
Handle_V3d_View myView;
Handle_Graphic3d_GraphicDriver myGraphicDriver;
Handle(V3d_View) myView;
Handle(Graphic3d_GraphicDriver) myGraphicDriver;
View3D_CurrentAction myCurrentMode;
Standard_Integer myXmin;
Standard_Integer myYmin;

2
samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp
View File

@@ -15,7 +15,7 @@ static char THIS_FILE[] = __FILE__;
/////////////////////////////////////////////////////////////////////////////
// ZClippingDlg dialog
ZClippingDlg::ZClippingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
ZClippingDlg::ZClippingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
: CDialog(ZClippingDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(ZClippingDlg)

2
samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.h
View File

@@ -14,7 +14,7 @@ class ZClippingDlg : public CDialog
{
// Construction
public:
ZClippingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL); // standard constructor
ZClippingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(ZClippingDlg)

2
samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.cpp
View File

@@ -16,7 +16,7 @@ static char THIS_FILE[] = __FILE__;
// ZCueingDlg dialog
ZCueingDlg::ZCueingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
ZCueingDlg::ZCueingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
: CDialog(ZCueingDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(ZCueingDlg)

4
samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.h
View File

@@ -14,7 +14,7 @@ class ZCueingDlg : public CDialog
{
// Construction
public:
ZCueingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL);
ZCueingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL);
// Dialog Data
//{{AFX_DATA(ZCueingDlg)
enum { IDD = IDD_ZCUEING };
@@ -48,7 +48,7 @@ protected:
private:
Handle_V3d_View myCurrent_V3d_View;
Handle(V3d_View) myCurrent_V3d_View;
CViewer3dDoc* myDoc;
};