OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0025036: Compilation errors in occt qt Voxel sample

Browse Source 
Graphic3d_CBounds was replaced by Graphic3d_BndBox4f
This commit is contained in:
vpa 2014-06-26 19:00:57 +04:00 committed by bugmaster
parent c9fb852983
commit aade732dda
2 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
View File

@ -17,7 +17,7 @@
#define _VOXEL_VISDRAWER_H_ #define _VOXEL_VISDRAWER_H_
#include "Voxel_VisData.h" #include "Voxel_VisData.h"
#include <Graphic3d_CBounds.hxx> #include <Graphic3d_BndBox4f.hxx>
class Handle(OpenGl_GraphicDriver); class Handle(OpenGl_GraphicDriver);
@ -34,7 +34,7 @@ public:
Standard_EXPORT VoxelClient_VisDrawer(Voxel_VisData* theData); Standard_EXPORT VoxelClient_VisDrawer(Voxel_VisData* theData);
Standard_EXPORT virtual ~VoxelClient_VisDrawer(); Standard_EXPORT virtual ~VoxelClient_VisDrawer();
Standard_EXPORT void EvalMinMax(Graphic3d_CBounds& theMinMax) const; Standard_EXPORT void EvalMinMax(Graphic3d_BndBox4f& theMinMax) const;
Standard_EXPORT void Display(const Standard_Boolean theHighlight); Standard_EXPORT void Display(const Standard_Boolean theHighlight);
private: private:

116
samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
View File

@ -38,7 +38,7 @@ public:
VisElement (Voxel_VisData*); VisElement (Voxel_VisData*);
virtual ~VisElement(); virtual ~VisElement();
void EvaluateBounds (Graphic3d_CBounds& theMinMax); void EvaluateBounds (Graphic3d_BndBox4f& theMinMax);
void Render (const Handle(OpenGl_Workspace) &theWorkspace) const; void Render (const Handle(OpenGl_Workspace) &theWorkspace) const;
@ -83,7 +83,7 @@ VoxelClient_VisDrawer::VisElement::~VisElement ()
//======================================================================= //=======================================================================
void VoxelClient_VisDrawer::VisElement::EvaluateBounds void VoxelClient_VisDrawer::VisElement::EvaluateBounds
(Graphic3d_CBounds& theMinMax) (Graphic3d_BndBox4f& theMinMax)
{ {
myHandler->EvalMinMax (theMinMax); myHandler->EvalMinMax (theMinMax);
} }
@ -221,60 +221,57 @@ VoxelClient_VisDrawer::~VoxelClient_VisDrawer()
} }
/**************************************************************************/ /**************************************************************************/
void VoxelClient_VisDrawer::EvalMinMax(Graphic3d_CBounds & theMinMax) const void VoxelClient_VisDrawer::EvalMinMax(Graphic3d_BndBox4f& theMinMax) const
{ {
theMinMax.XMin = FLT_MAX; Graphic3d_Vec4 aMinPt (FLT_MAX, FLT_MAX, FLT_MAX, 1.0f);
theMinMax.YMin = FLT_MAX; Graphic3d_Vec4 aMaxPt (-FLT_MAX, -FLT_MAX, -FLT_MAX, 1.0f);
theMinMax.ZMin = FLT_MAX;
theMinMax.XMax = -FLT_MAX;
theMinMax.YMax = -FLT_MAX;
theMinMax.ZMax = -FLT_MAX;
if(!myData) if(!myData)
return; return;
if(myData->myBoolVoxels) if(myData->myBoolVoxels)
{ {
if (theMinMax.XMin > myData->myBoolVoxels->GetX()) Graphic3d_Vec4 aBoolVoxelsMin (RealToShortReal (myData->myBoolVoxels->GetX()),
theMinMax.XMin = myData->myBoolVoxels->GetX(); RealToShortReal (myData->myBoolVoxels->GetY()),
if (theMinMax.XMax < myData->myBoolVoxels->GetX() + myData->myBoolVoxels->GetXLen()) RealToShortReal (myData->myBoolVoxels->GetZ()),
theMinMax.XMax = myData->myBoolVoxels->GetX() + myData->myBoolVoxels->GetXLen(); 1.0f);
if (theMinMax.YMin > myData->myBoolVoxels->GetY()) Graphic3d_Vec4 aBoolVoxelsMax (
theMinMax.YMin = myData->myBoolVoxels->GetY(); RealToShortReal (myData->myBoolVoxels->GetX() + myData->myBoolVoxels->GetXLen()),
if (theMinMax.YMax < myData->myBoolVoxels->GetY() + myData->myBoolVoxels->GetYLen()) RealToShortReal (myData->myBoolVoxels->GetY() + myData->myBoolVoxels->GetYLen()),
theMinMax.YMax = myData->myBoolVoxels->GetY() + myData->myBoolVoxels->GetYLen(); RealToShortReal (myData->myBoolVoxels->GetZ() + myData->myBoolVoxels->GetZLen()),
if (theMinMax.ZMin > myData->myBoolVoxels->GetZ()) 1.0f);
theMinMax.ZMin = myData->myBoolVoxels->GetZ();
if (theMinMax.ZMax < myData->myBoolVoxels->GetZ() + myData->myBoolVoxels->GetZLen()) aMinPt = aMinPt.cwiseMin (aBoolVoxelsMin);
theMinMax.ZMax = myData->myBoolVoxels->GetZ() + myData->myBoolVoxels->GetZLen(); aMaxPt = aMaxPt.cwiseMax (aBoolVoxelsMax);
} }
if(myData->myColorVoxels) if(myData->myColorVoxels)
{ {
if (theMinMax.XMin > myData->myColorVoxels->GetX()) Graphic3d_Vec4 aColorVoxelsMin (RealToShortReal (myData->myColorVoxels->GetX()),
theMinMax.XMin = myData->myColorVoxels->GetX(); RealToShortReal (myData->myColorVoxels->GetY()),
if (theMinMax.XMax < myData->myColorVoxels->GetX() + myData->myColorVoxels->GetXLen()) RealToShortReal (myData->myColorVoxels->GetZ()),
theMinMax.XMax = myData->myColorVoxels->GetX() + myData->myColorVoxels->GetXLen(); 1.0f);
if (theMinMax.YMin > myData->myColorVoxels->GetY()) Graphic3d_Vec4 aColorVoxelsMax (
theMinMax.YMin = myData->myColorVoxels->GetY(); RealToShortReal (myData->myColorVoxels->GetX() + myData->myColorVoxels->GetXLen()),
if (theMinMax.YMax < myData->myColorVoxels->GetY() + myData->myColorVoxels->GetYLen()) RealToShortReal (myData->myColorVoxels->GetY() + myData->myColorVoxels->GetYLen()),
theMinMax.YMax = myData->myColorVoxels->GetY() + myData->myColorVoxels->GetYLen(); RealToShortReal (myData->myColorVoxels->GetZ() + myData->myColorVoxels->GetZLen()),
if (theMinMax.ZMin > myData->myColorVoxels->GetZ()) 1.0f);
theMinMax.ZMin = myData->myColorVoxels->GetZ();
if (theMinMax.ZMax < myData->myColorVoxels->GetZ() + myData->myColorVoxels->GetZLen()) aMinPt = aMinPt.cwiseMin (aColorVoxelsMin);
theMinMax.ZMax = myData->myColorVoxels->GetZ() + myData->myColorVoxels->GetZLen(); aMaxPt = aMaxPt.cwiseMax (aColorVoxelsMax);
} }
if(myData->myROctBoolVoxels) if(myData->myROctBoolVoxels)
{ {
if (theMinMax.XMin > myData->myROctBoolVoxels->GetX()) Graphic3d_Vec4 aROctBoolVoxelsMin (RealToShortReal (myData->myROctBoolVoxels->GetX()),
theMinMax.XMin = myData->myROctBoolVoxels->GetX(); RealToShortReal (myData->myROctBoolVoxels->GetY()),
if (theMinMax.XMax < myData->myROctBoolVoxels->GetX() + myData->myROctBoolVoxels->GetXLen()) RealToShortReal (myData->myROctBoolVoxels->GetZ()),
theMinMax.XMax = myData->myROctBoolVoxels->GetX() + myData->myROctBoolVoxels->GetXLen(); 1.0f);
if (theMinMax.YMin > myData->myROctBoolVoxels->GetY()) Graphic3d_Vec4 aROctBoolVoxelsMax (
theMinMax.YMin = myData->myROctBoolVoxels->GetY(); RealToShortReal (myData->myROctBoolVoxels->GetX() + myData->myROctBoolVoxels->GetXLen()),
if (theMinMax.YMax < myData->myROctBoolVoxels->GetY() + myData->myROctBoolVoxels->GetYLen()) RealToShortReal (myData->myROctBoolVoxels->GetY() + myData->myROctBoolVoxels->GetYLen()),
theMinMax.YMax = myData->myROctBoolVoxels->GetY() + myData->myROctBoolVoxels->GetYLen(); RealToShortReal (myData->myROctBoolVoxels->GetZ() + myData->myROctBoolVoxels->GetZLen()),
if (theMinMax.ZMin > myData->myROctBoolVoxels->GetZ()) 1.0f);
theMinMax.ZMin = myData->myROctBoolVoxels->GetZ();
if (theMinMax.ZMax < myData->myROctBoolVoxels->GetZ() + myData->myROctBoolVoxels->GetZLen()) aMinPt = aMinPt.cwiseMin (aROctBoolVoxelsMin);
theMinMax.ZMax = myData->myROctBoolVoxels->GetZ() + myData->myROctBoolVoxels->GetZLen(); aMaxPt = aMaxPt.cwiseMax (aROctBoolVoxelsMax);
} }
if (!myData->myTriangulation.IsNull()) if (!myData->myTriangulation.IsNull())
{ {
@ -284,20 +281,25 @@ void VoxelClient_VisDrawer::EvalMinMax(Graphic3d_CBounds & theMinMax) const
for (; inode <= nb_nodes; inode++) for (; inode <= nb_nodes; inode++)
{ {
nodes.Value(inode).Coord(x, y, z); nodes.Value(inode).Coord(x, y, z);
if (theMinMax.XMin > x) Graphic3d_Vec4 aNodeCoord (RealToShortReal (x),
theMinMax.XMin = x; RealToShortReal (y),
if (theMinMax.XMax < x) RealToShortReal (z),
theMinMax.XMax = x; 1.0f);
if (theMinMax.YMin > y) aMinPt = aMinPt.cwiseMin (aNodeCoord);
theMinMax.YMin = y; aMaxPt = aMaxPt.cwiseMax (aNodeCoord);
if (theMinMax.YMax < y)
theMinMax.YMax = y;
if (theMinMax.ZMin > z)
theMinMax.ZMin = z;
if (theMinMax.ZMax < z)
theMinMax.ZMax = z;
} }
} }
if (theMinMax.IsValid())
{
theMinMax.CornerMin() = aMinPt;
theMinMax.CornerMax() = aMaxPt;
}
else
{
theMinMax.Add (aMinPt);
theMinMax.Add (aMaxPt);
}
} }
/**************************************************************************/ /**************************************************************************/