Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_LengthDimension.cpp

diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp
index 2b55584a000dd1a7123ab14290e5351692c56f2c..34c7401d2d23bb865c528357a6c0d9cd633390d6 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp
+++ b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp
@@ -43,7 +43,7 @@
 
 #include <AIS_DisplaySpecialSymbol.hxx>
 
-//#ifdef OCCT_28850_FIXED
+#define OCCT_28850_FIXED
 
 /// Creates an aspect to be shown in length/radius dimension presentations
 /// \return an instance of aspect
@@ -54,7 +54,7 @@ Handle(Prs3d_DimensionAspect) createDimensionAspect()
   anAspect->MakeText3d(false);
   anAspect->MakeTextShaded(false);
   anAspect->MakeUnitsDisplayed(false);
-  anAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getDefaultTextHeight());
+  anAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getConfigTextHeight());
   anAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize());
 
   return anAspect;
@@ -70,7 +70,7 @@ void updateArrows(Handle(Prs3d_DimensionAspect) theDimAspect,
   if (theLocationType == SketcherPrs_Tools::LOCATION_AUTOMATIC) {
     double anArrowLength = theDimAspect->ArrowAspect()->Length();
      // This is not realy correct way to get viewer scale.
-    double aViewerScale = (double) SketcherPrs_Tools::getDefaultArrowSize() / anArrowLength;
+    double aViewerScale = (double) SketcherPrs_Tools::getConfigArrowSize() / anArrowLength;
 
     if(theTextSize > ((theDimValue - 3 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) {
       theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left);
@@ -87,7 +87,15 @@ void updateArrows(Handle(Prs3d_DimensionAspect) theDimAspect,
     theDimAspect->SetTextHorizontalPosition(
       theLocationType == SketcherPrs_Tools::LOCATION_LEFT ? Prs3d_DTHP_Left : Prs3d_DTHP_Right);
     theDimAspect->SetArrowOrientation(Prs3d_DAO_External);
+
+    double anArrowLength = theDimAspect->ArrowAspect()->Length();
+    // This is not realy correct way to get viewer scale.
+    double aViewerScale = (double) SketcherPrs_Tools::getConfigArrowSize() / anArrowLength;
+    theDimAspect->SetExtensionSize(
+        (theTextSize / aViewerScale + SketcherPrs_Tools::getArrowSize()) / 2.0);
   }
+  theDimAspect->TextAspect()->SetFont(Config_PropManager::string("Visualization",
+                                      "dimension_font").c_str());
 
   theDimAspect->SetArrowTailSize(theDimAspect->ArrowAspect()->Length());
   // The value of vertical aligment is sometimes changed
@@ -117,9 +125,9 @@ SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theCo
 
 #ifdef OCCT_28850_FIXED
   if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID())
-    SetDirection(true, mySketcherPlane->dirX()->impl<gp_Dir>());
+    SetDirection(mySketcherPlane->dirX()->impl<gp_Dir>(), true);
   else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID())
-    SetDirection(true, mySketcherPlane->dirY()->impl<gp_Dir>());
+    SetDirection(mySketcherPlane->dirY()->impl<gp_Dir>(), true);
 #endif
 }
 
@@ -150,7 +158,12 @@ void SketcherPrs_LengthDimension::Compute(
     myPlane = gp_Pln(mySketcherPlane->impl<gp_Ax3>());
 
     DataPtr aData = myConstraint->data();
-    AttributeDoublePtr anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE());
+    AttributeDoublePtr anAttributeValue;
+    if (myConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID() ||
+        myConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID())
+      anAttributeValue = aData->real(SketchPlugin_ConstraintDistanceAlongDir::DISTANCE_VALUE_ID());
+    else
+      anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE());
     myValue.init(anAttributeValue);
   }
 
@@ -162,16 +175,21 @@ void SketcherPrs_LengthDimension::Compute(
   double aTextSize = 0.0;
   GetValueString(aTextSize);
 
-  SketcherPrs_Tools::LocationType aLocationType = SketcherPrs_Tools::LOCATION_AUTOMATIC;
   std::string aLocationAttribute;
-  if (myConstraint->getKind() == SketchPlugin_ConstraintLength::ID())
+  std::string aConstraintKind = myConstraint->getKind();
+  if (aConstraintKind == SketchPlugin_ConstraintLength::ID())
     aLocationAttribute = SketchPlugin_ConstraintLength::LOCATION_TYPE_ID();
-  if (!aLocationAttribute.empty())
-  {
-    std::shared_ptr<ModelAPI_AttributeInteger> aTypeAttr = std::dynamic_pointer_cast<
-      ModelAPI_AttributeInteger>(myConstraint->data()->attribute(aLocationAttribute));
-    aLocationType = (SketcherPrs_Tools::LocationType)(aTypeAttr->value());
-  }
+  else if (aConstraintKind == SketchPlugin_ConstraintDistance::ID())
+    aLocationAttribute = SketchPlugin_ConstraintDistance::LOCATION_TYPE_ID();
+  else if (aConstraintKind == SketchPlugin_ConstraintDistanceHorizontal::ID())
+    aLocationAttribute = SketchPlugin_ConstraintDistanceHorizontal::LOCATION_TYPE_ID();
+  else if (aConstraintKind == SketchPlugin_ConstraintDistanceVertical::ID())
+    aLocationAttribute = SketchPlugin_ConstraintDistanceVertical::LOCATION_TYPE_ID();
+
+  AttributeIntegerPtr aLocAttr = std::dynamic_pointer_cast<ModelAPI_AttributeInteger>
+    (myConstraint->data()->attribute(aLocationAttribute));
+  SketcherPrs_Tools::LocationType aLocationType = aLocAttr->isInitialized() ?
+    (SketcherPrs_Tools::LocationType)(aLocAttr->value()) : SketcherPrs_Tools::LOCATION_AUTOMATIC;
   updateArrows(DimensionAspect(), GetValue(), aTextSize, aLocationType);
 
   // Update text visualization: parameter value or parameter text
@@ -248,6 +266,15 @@ bool SketcherPrs_LengthDimension::readyToDisplay(ModelAPI_Feature* theConstraint
     if (!aPnt_A || !aPnt_B) // Objects not found
       return false;
 
+    if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID()) {
+      if (fabs(aPnt_A->x() - aPnt_B->x()) < Precision::Confusion())
+        return false;
+    }
+    else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) {
+      if (fabs(aPnt_A->y() - aPnt_B->y()) < Precision::Confusion())
+        return false;
+    }
+
     // Get points from these object
     std::shared_ptr<GeomAPI_Pnt> aPoint1 = thePlane->to3D(aPnt_A->x(), aPnt_A->y());
     std::shared_ptr<GeomAPI_Pnt> aPoint2 = thePlane->to3D(aPnt_B->x(), aPnt_B->y());
@@ -284,6 +311,6 @@ void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Select
     return;
   }
   }
-  SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight());
+  SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.);
   AIS_LengthDimension::ComputeSelection(aSelection, aMode);
 }