Optimization of sketcher dimensions presentations: make text and arrows size smaller...

diff --git a/src/GeomAPI/GeomAPI_Circ.h b/src/GeomAPI/GeomAPI_Circ.h
index 2532ef2edd3bc7c95f5cd99a72821757fec285b1..71ede7631191fcebb7cafe906944a10eb8ecc64b 100644 (file)
--- 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<GeomAPI_Pnt>& theCenter,
+  GEOMAPI_EXPORT GeomAPI_Circ(const std::shared_ptr<GeomAPI_Pnt>& theCenter,
                const std::shared_ptr<GeomAPI_Dir>& theDir, double theRadius);
 
   /// Return center of the circle
-  const std::shared_ptr<GeomAPI_Pnt> center() const;
+  GEOMAPI_EXPORT const std::shared_ptr<GeomAPI_Pnt> center() const;
 
   /// Return radius of the circle
-  double radius() const;
+  GEOMAPI_EXPORT double radius() const;
 
   /// Project point on circle
-  const std::shared_ptr<GeomAPI_Pnt> project(
+  GEOMAPI_EXPORT const std::shared_ptr<GeomAPI_Pnt> project(
       const std::shared_ptr<GeomAPI_Pnt>& thePoint) const;
 };
 

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index 7083dedb466c17eba3cf8c188f355c1bde2edcc7..fd5c83fce11ef200fe7d9faafa5a4e2dc534f143 100644 (file)
--- 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<void> 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<class T> 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<class T> 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 f2fbe2894153c2c835a64ac759e816cde7d304a2..72cc8beeebcca35377c402a4b0efc7923c0924ca 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Tools.cpp
+++ b/src/SketcherPrs/SketcherPrs_Tools.cpp
@@ -125,7 +125,7 @@ std::shared_ptr<GeomAPI_Pnt2d> 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)