From f5ec46873a93bcb124c0ba8462e34db9ea8f21c2 Mon Sep 17 00:00:00 2001 From: mpv Date: Tue, 30 Jun 2015 16:57:41 +0300 Subject: [PATCH] Optimization of sketcher dimensions presentations: make text and arrows size smaller basing on TestHighLoad case. --- src/GeomAPI/GeomAPI_Circ.h | 10 +++++----- src/GeomAPI/GeomAPI_Interface.h | 8 ++++---- src/SketcherPrs/SketcherPrs_Tools.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/GeomAPI/GeomAPI_Circ.h b/src/GeomAPI/GeomAPI_Circ.h index 2532ef2ed..71ede7631 100644 --- a/src/GeomAPI/GeomAPI_Circ.h +++ b/src/GeomAPI/GeomAPI_Circ.h @@ -18,21 +18,21 @@ class GeomAPI_Dir; * \brief Circle in 3D */ -class GEOMAPI_EXPORT GeomAPI_Circ : public GeomAPI_Interface +class GeomAPI_Circ : public GeomAPI_Interface { public: /// Creation of circle defined by center point, direction and circle radius - GeomAPI_Circ(const std::shared_ptr& theCenter, + GEOMAPI_EXPORT GeomAPI_Circ(const std::shared_ptr& theCenter, const std::shared_ptr& theDir, double theRadius); /// Return center of the circle - const std::shared_ptr center() const; + GEOMAPI_EXPORT const std::shared_ptr center() const; /// Return radius of the circle - double radius() const; + GEOMAPI_EXPORT double radius() const; /// Project point on circle - const std::shared_ptr project( + GEOMAPI_EXPORT const std::shared_ptr project( const std::shared_ptr& thePoint) const; }; diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h index 7083dedb4..fd5c83fce 100644 --- a/src/GeomAPI/GeomAPI_Interface.h +++ b/src/GeomAPI/GeomAPI_Interface.h @@ -16,14 +16,14 @@ * \brief General base class for all interfaces in this package */ -class GEOMAPI_EXPORT GeomAPI_Interface +class GeomAPI_Interface { private: std::shared_ptr myImpl; ///< pointer to the internal impl object public: /// None - constructor - GeomAPI_Interface(); + GEOMAPI_EXPORT GeomAPI_Interface(); /// Constructor by the impl pointer (used for internal needs) template explicit GeomAPI_Interface(T* theImpl) @@ -32,7 +32,7 @@ class GEOMAPI_EXPORT GeomAPI_Interface } /// Destructor - virtual ~GeomAPI_Interface(); + GEOMAPI_EXPORT virtual ~GeomAPI_Interface(); /// Returns the pointer to the impl template inline T* implPtr() @@ -56,7 +56,7 @@ class GEOMAPI_EXPORT GeomAPI_Interface } /// Returns true if the impl is empty - bool empty() const; + GEOMAPI_EXPORT bool empty() const; }; #endif diff --git a/src/SketcherPrs/SketcherPrs_Tools.cpp b/src/SketcherPrs/SketcherPrs_Tools.cpp index f2fbe2894..72cc8beee 100644 --- a/src/SketcherPrs/SketcherPrs_Tools.cpp +++ b/src/SketcherPrs/SketcherPrs_Tools.cpp @@ -125,7 +125,7 @@ std::shared_ptr getProjectionPoint(const FeaturePtr theLine, } -static double MyArrowSize = 30.; +static double MyArrowSize = 24.; double getArrowSize() { return MyArrowSize; @@ -136,7 +136,7 @@ void setArrowSize(double theSize) MyArrowSize = theSize; } -static double MyTextHeight = 20; +static double MyTextHeight = 16; double getTextHeight() { return MyTextHeight; @@ -149,7 +149,7 @@ void setTextHeight(double theHeight) double getDefaultTextHeight() { - return 30; + return 16; } double getFlyoutDistance(const ModelAPI_Feature* theConstraint) -- 2.39.2