-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: SketcherPrs_LengthDimension.cpp
-// Created: 27 March 2015
-// Author: Vitaly SMETANNIKOV
+// 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include "SketcherPrs_LengthDimension.h"
#include "SketcherPrs_Tools.h"
#include <SketchPlugin_Constraint.h>
#include <SketchPlugin_ConstraintLength.h>
#include <SketchPlugin_ConstraintDistance.h>
+#include <SketchPlugin_ConstraintDistanceHorizontal.h>
+#include <SketchPlugin_ConstraintDistanceVertical.h>
#include <SketchPlugin_Line.h>
#include <SketchPlugin_Point.h>
#include <SketchPlugin_Circle.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeInteger.h>
#include <AIS_DisplaySpecialSymbol.hxx>
+#define OCCT_28850_FIXED
/// Creates an aspect to be shown in length/radius dimension presentations
/// \return an instance of aspect
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;
/// \param theDimValue an arrow value
/// \param theTextSize an arrow value
void updateArrows(Handle(Prs3d_DimensionAspect) theDimAspect,
- double theDimValue, double theTextSize)
+ double theDimValue, double theTextSize, SketcherPrs_Tools::LocationType theLocationType)
{
- double anArrowLength = theDimAspect->ArrowAspect()->Length();
- // This is not realy correct way to get viewer scale.
- double aViewerScale = (double) SketcherPrs_Tools::getDefaultArrowSize() / anArrowLength;
-
- if(theTextSize > ((theDimValue - 3 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) {
- theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left);
+ 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::getConfigArrowSize() / anArrowLength;
+
+ if(theTextSize > ((theDimValue - 3 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) {
+ theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left);
+ theDimAspect->SetArrowOrientation(Prs3d_DAO_External);
+ theDimAspect->SetExtensionSize(
+ (theTextSize / aViewerScale + SketcherPrs_Tools::getArrowSize()) / 2.0);
+ } else {
+ theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Center);
+ theDimAspect->SetArrowOrientation(Prs3d_DAO_Internal);
+ }
+ }
+ else if (theLocationType == SketcherPrs_Tools::LOCATION_RIGHT ||
+ theLocationType == SketcherPrs_Tools::LOCATION_LEFT) {
+ 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);
- } else {
- theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Center);
- theDimAspect->SetArrowOrientation(Prs3d_DAO_Internal);
+ (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
theDimAspect->TextAspect()->SetVerticalJustification(Graphic3d_VTA_CENTER);
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),
{
SetDimensionAspect(createDimensionAspect());
myStyleListener = new SketcherPrs_DimensionStyleListener();
+
+#ifdef OCCT_28850_FIXED
+ if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID())
+ SetDirection(plane()->dirX()->impl<gp_Dir>(), true);
+ else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID())
+ SetDirection(plane()->dirY()->impl<gp_Dir>(), true);
+#endif
}
SketcherPrs_LengthDimension::~SketcherPrs_LengthDimension()
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);
}
double aTextSize = 0.0;
GetValueString(aTextSize);
- updateArrows(DimensionAspect(), GetValue(), aTextSize);
+ std::string aLocationAttribute;
+ std::string aConstraintKind = myConstraint->getKind();
+ if (aConstraintKind == SketchPlugin_ConstraintLength::ID())
+ aLocationAttribute = SketchPlugin_ConstraintLength::LOCATION_TYPE_ID();
+ 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
myStyleListener->updateDimensions(this, myValue);
thePnt2 = thePlane->to3D(aEndPoint->x(), aEndPoint->y())->impl<gp_Pnt>();
return true;
- } else if (theConstraint->getKind() == SketchPlugin_ConstraintDistance::ID()) {
+ } else if (theConstraint->getKind() == SketchPlugin_ConstraintDistance::ID() ||
+ theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID() ||
+ theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) {
// The constraint is distance
std::shared_ptr<GeomDataAPI_Point2D> aPoint_A = SketcherPrs_Tools::getFeaturePoint(
aData, SketchPlugin_Constraint::ENTITY_A(), thePlane);
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());
return;
}
}
- SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight());
+ SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.);
AIS_LengthDimension::ComputeSelection(aSelection, aMode);
}
