-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SketcherPrs_LengthDimension.h"
theDimAspect->SetExtensionSize(
(theTextSize / aViewerScale + SketcherPrs_Tools::getArrowSize()) / 2.0);
}
- theDimAspect->TextAspect()->SetFont(Config_PropManager::string(SKETCH_TAB_NAME,
+ theDimAspect->TextAspect()->SetFont(Config_PropManager::string("Visualization",
"dimension_font").c_str());
theDimAspect->SetArrowTailSize(theDimAspect->ArrowAspect()->Length());
IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_LengthDimension, AIS_LengthDimension);
SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theConstraint,
- const std::shared_ptr<GeomAPI_Ax3>& thePlane)
+ SketchPlugin_Sketch* theSketcher)
: AIS_LengthDimension(MyDefStart, MyDefEnd, MyDefPln),
myConstraint(theConstraint),
- mySketcherPlane(thePlane),
+ mySketcher(theSketcher),
myFirstPoint(MyDefStart),
mySecondPoint(MyDefEnd),
myPlane(MyDefPln),
#ifdef OCCT_28850_FIXED
if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID())
- SetDirection(mySketcherPlane->dirX()->impl<gp_Dir>(), true);
+ SetDirection(plane()->dirX()->impl<gp_Dir>(), true);
else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID())
- SetDirection(mySketcherPlane->dirY()->impl<gp_Dir>(), true);
+ SetDirection(plane()->dirY()->impl<gp_Dir>(), true);
#endif
}
const Standard_Integer theMode)
{
gp_Pnt aPnt1, aPnt2;
- bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aPnt1, aPnt2);
+ bool aReadyToDisplay = readyToDisplay(myConstraint, plane(), aPnt1, aPnt2);
if (aReadyToDisplay) {
myFirstPoint = aPnt1;
mySecondPoint = aPnt2;
myDistance = SketcherPrs_Tools::getFlyoutDistance(myConstraint);
- myPlane = gp_Pln(mySketcherPlane->impl<gp_Ax3>());
+ myPlane = gp_Pln(plane()->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);
}
return;
}
}
- SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight());
+ SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.);
AIS_LengthDimension::ComputeSelection(aSelection, aMode);
}