From: omy Date: Mon, 31 Aug 2015 14:23:35 +0000 (+0300) Subject: Resolving merge errors. X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=a1873a98ec32fd5b120f545a163bb335f9a10016;p=occt-copy.git Resolving merge errors. --- diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx index 1f740b08ab..4905c4505b 100644 --- a/src/Graphic3d/Graphic3d_Camera.cxx +++ b/src/Graphic3d/Graphic3d_Camera.cxx @@ -1114,8 +1114,8 @@ void Graphic3d_Camera::ZFitAll (const Standard_Real theScaleFactor, const Bnd_Bo // To avoid numeric errors... (See comments in the beginning of the method). // Choose between model distance and graphical distance, as the model boundaries // might be infinite if all structures have infinite flag. - const Standard_Real aGraphicDepth = aGraphicMaxDist >= aGraphicMinDist - ? aGraphicMaxDist - aGraphicMinDist : RealLast(); + const Standard_Real aGraphicDepth = aGraphMaxDist >= aGraphMinDist + ? aGraphMaxDist - aGraphMinDist : RealLast(); const Standard_Real aModelDepth = aModelMaxDist >= aModelMinDist ? aModelMaxDist - aModelMinDist : RealLast(); diff --git a/src/Graphic3d/Graphic3d_Group.hxx b/src/Graphic3d/Graphic3d_Group.hxx index 7e48241564..93e16ac1c0 100644 --- a/src/Graphic3d/Graphic3d_Group.hxx +++ b/src/Graphic3d/Graphic3d_Group.hxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -275,6 +276,10 @@ public: //! Return true if primitive arrays within this graphic group form closed volume (do no contain open shells). Standard_EXPORT Standard_Boolean IsClosed() const; + //! Adds a volume. + Standard_EXPORT void AddVolume (const Handle(Graphic3d_Volume)& theVolume, + const Standard_Boolean theToEvalMinMax = Standard_False); + friend class Graphic3d_Structure; diff --git a/src/Graphic3d/Graphic3d_TransferFunction.cxx b/src/Graphic3d/Graphic3d_TransferFunction.cxx index bc1639e054..9bacbdfd08 100644 --- a/src/Graphic3d/Graphic3d_TransferFunction.cxx +++ b/src/Graphic3d/Graphic3d_TransferFunction.cxx @@ -14,6 +14,7 @@ // commercial license or contractual agreement. #include +#include IMPLEMENT_STANDARD_HANDLE (Graphic3d_TransferFunction, Standard_Transient) -IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TransferFunction, Standard_Transient) +IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_TransferFunction, Standard_Transient) diff --git a/src/Graphic3d/Graphic3d_TransferFunction.hxx b/src/Graphic3d/Graphic3d_TransferFunction.hxx index 2daefe1462..c5a626e83c 100644 --- a/src/Graphic3d/Graphic3d_TransferFunction.hxx +++ b/src/Graphic3d/Graphic3d_TransferFunction.hxx @@ -65,7 +65,7 @@ protected: public: - DEFINE_STANDARD_RTTI (Graphic3d_TransferFunction) + DEFINE_STANDARD_RTTI (Graphic3d_TransferFunction, Standard_Transient) }; diff --git a/src/Graphic3d/Graphic3d_Volume.cxx b/src/Graphic3d/Graphic3d_Volume.cxx index ba0ea3adbf..75186fde95 100644 --- a/src/Graphic3d/Graphic3d_Volume.cxx +++ b/src/Graphic3d/Graphic3d_Volume.cxx @@ -15,9 +15,10 @@ #include #include +#include IMPLEMENT_STANDARD_HANDLE (Graphic3d_Volume, Standard_Transient) -IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Volume, Standard_Transient) +IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_Volume) //================================================= //function : Graphic3d_Volume diff --git a/src/Graphic3d/Graphic3d_Volume.hxx b/src/Graphic3d/Graphic3d_Volume.hxx index c28556f5ac..3e2f499fe3 100644 --- a/src/Graphic3d/Graphic3d_Volume.hxx +++ b/src/Graphic3d/Graphic3d_Volume.hxx @@ -230,7 +230,7 @@ protected: public: - DEFINE_STANDARD_RTTI (Graphic3d_Volume) + DEFINE_STANDARD_RTTI (Graphic3d_Volume, Standard_Transient) }; diff --git a/src/Graphic3d/Graphic3d_VolumeData.cxx b/src/Graphic3d/Graphic3d_VolumeData.cxx index 2114b1ae13..a51ca1cf30 100644 --- a/src/Graphic3d/Graphic3d_VolumeData.cxx +++ b/src/Graphic3d/Graphic3d_VolumeData.cxx @@ -14,9 +14,10 @@ // commercial license or contractual agreement. #include +#include IMPLEMENT_STANDARD_HANDLE (Graphic3d_VolumeData, Standard_Transient) -IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_VolumeData, Standard_Transient) +IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_VolumeData) //======================================================================== //function : Graphic3d_VolumeData diff --git a/src/Graphic3d/Graphic3d_VolumeData.hxx b/src/Graphic3d/Graphic3d_VolumeData.hxx index 49310fd44a..21e5442382 100644 --- a/src/Graphic3d/Graphic3d_VolumeData.hxx +++ b/src/Graphic3d/Graphic3d_VolumeData.hxx @@ -138,7 +138,7 @@ private: public: - DEFINE_STANDARD_RTTI (Graphic3d_VolumeData) + DEFINE_STANDARD_RTTI (Graphic3d_VolumeData, Standard_Transient) }; diff --git a/src/OpenGl/FILES b/src/OpenGl/FILES index 511b1f2a98..478ccee20c 100755 --- a/src/OpenGl/FILES +++ b/src/OpenGl/FILES @@ -160,10 +160,8 @@ OpenGl_BVHTreeSelector.cxx OpenGl_BVHClipPrimitiveSet.cxx OpenGl_BVHClipPrimitiveSet.hxx OpenGl_ArbTexBindless.hxx -Handle_OpenGl_Sampler.hxx OpenGl_Sampler.hxx OpenGl_Sampler.cxx -OpenGl_Utils.hxx OpenGl_Quadric.hxx OpenGl_Quadric.cxx OpenGl_Cylinder.hxx @@ -176,3 +174,5 @@ OpenGl_BackgroundArray.hxx OpenGl_BackgroundArray.cxx OpenGl_Volume.hxx OpenGl_Volume.cxx +OpenGl_TextBuilder.hxx +OpenGl_TextBuilder.cxx diff --git a/src/Voxel/Handle_Voxel_Prs.hxx b/src/Voxel/Handle_Voxel_Prs.hxx index 52362fa04c..05bb8bf75c 100644 --- a/src/Voxel/Handle_Voxel_Prs.hxx +++ b/src/Voxel/Handle_Voxel_Prs.hxx @@ -18,11 +18,9 @@ #include #include -#include +#include class Standard_Transient; -class Handle(Standard_Type); -class Handle(AIS_InteractiveObject); class Voxel_Prs; DEFINE_STANDARD_HANDLE(Voxel_Prs, AIS_InteractiveObject) diff --git a/src/Voxel/Voxel_Prs.cxx b/src/Voxel/Voxel_Prs.cxx index e0cde80e77..f646ae3cb9 100644 --- a/src/Voxel/Voxel_Prs.cxx +++ b/src/Voxel/Voxel_Prs.cxx @@ -16,6 +16,8 @@ #include #include #include +#include +#include IMPLEMENT_STANDARD_HANDLE (Voxel_Prs, AIS_InteractiveObject) IMPLEMENT_STANDARD_RTTIEXT(Voxel_Prs, AIS_InteractiveObject) diff --git a/src/Voxel/Voxel_Prs.hxx b/src/Voxel/Voxel_Prs.hxx index 6e423bdc59..2ab4cf42cc 100644 --- a/src/Voxel/Voxel_Prs.hxx +++ b/src/Voxel/Voxel_Prs.hxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -46,7 +47,7 @@ public: //! Sets 3D volume object. void SetVolume (const Handle(Graphic3d_Volume)& theVolume) { - myVolume = theVolume; + myVolume = theVolume; } protected: @@ -67,7 +68,7 @@ protected: public: - DEFINE_STANDARD_RTTI (Voxel_Prs) + DEFINE_STANDARD_RTTI (Voxel_Prs, AIS_InteractiveObject) }; #endif // _Voxel_Prs_HeaderFile