From: nds Date: Wed, 7 Nov 2018 15:30:21 +0000 (+0300) Subject: 0030349: Coding - add usage of Standard_EXPORT for some not inline methods in Select3D X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=6b0fad4d5d99340bb4731a8df14f66db625d62c6;p=occt-copy.git 0030349: Coding - add usage of Standard_EXPORT for some not inline methods in Select3D (cherry picked from commit 95cf3cd996a9ba5970b3e107d06332fa43e4480b) --- diff --git a/src/Select3D/Select3D_SensitiveCircle.hxx b/src/Select3D/Select3D_SensitiveCircle.hxx index 12ca661577..0d3445463b 100644 --- a/src/Select3D/Select3D_SensitiveCircle.hxx +++ b/src/Select3D/Select3D_SensitiveCircle.hxx @@ -93,7 +93,7 @@ protected: //! Calculates distance from the 3d projection of used-picked screen point //! to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; private: diff --git a/src/Select3D/Select3D_SensitiveGroup.hxx b/src/Select3D/Select3D_SensitiveGroup.hxx index 58e64a383c..27540f4cb4 100644 --- a/src/Select3D/Select3D_SensitiveGroup.hxx +++ b/src/Select3D/Select3D_SensitiveGroup.hxx @@ -143,21 +143,21 @@ public: //! Returns the length of vector of sensitive entities Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE; -private: +protected: //! Checks whether the entity with index theIdx overlaps the current selecting volume - virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, - SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, + SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Checks whether the entity with index theIdx is inside the current selecting volume - virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Calculates distance from the 3d projection of used-picked screen point to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; private: diff --git a/src/Select3D/Select3D_SensitivePoly.hxx b/src/Select3D/Select3D_SensitivePoly.hxx index 8f600c8405..2658bc98a4 100644 --- a/src/Select3D/Select3D_SensitivePoly.hxx +++ b/src/Select3D/Select3D_SensitivePoly.hxx @@ -92,22 +92,22 @@ public: Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1, const Standard_Integer theIdx2) Standard_OVERRIDE; -private: +protected: //! Checks whether the segment with index theIdx overlaps the current selecting volume - virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, + Standard_EXPORT virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, SelectBasics_SelectingVolumeManager& theMgr, Standard_Integer theElemIdx, Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Checks whether the entity with index theIdx is inside the current selecting volume - virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, + Standard_EXPORT virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, Standard_Integer theElemIdx, Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Calculates distance from the 3d projection of used-picked screen point //! to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; protected: diff --git a/src/Select3D/Select3D_SensitiveTriangulation.hxx b/src/Select3D/Select3D_SensitiveTriangulation.hxx index b7228f0e21..2317c240be 100644 --- a/src/Select3D/Select3D_SensitiveTriangulation.hxx +++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx @@ -102,18 +102,18 @@ protected: private: //! Checks whether the element with index theIdx overlaps the current selecting volume - virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, - SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean overlapsElement (SelectBasics_PickResult& thePickResult, + SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; //! Calculates distance from the 3d projection of used-picked screen point to center of the geometry - virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Real distanceToCOG (SelectBasics_SelectingVolumeManager& theMgr) Standard_OVERRIDE; //! Checks whether the entity with index theIdx is inside the current selecting volume - virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, - Standard_Integer theElemIdx, - Standard_Boolean theIsFullInside) Standard_OVERRIDE; + Standard_EXPORT virtual Standard_Boolean elementIsInside (SelectBasics_SelectingVolumeManager& theMgr, + Standard_Integer theElemIdx, + Standard_Boolean theIsFullInside) Standard_OVERRIDE; private: