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());
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);
}
else if (aConstraintKind == SketchPlugin_ConstraintDistanceVertical::ID())
aLocationAttribute = SketchPlugin_ConstraintDistanceVertical::LOCATION_TYPE_ID();
- std::shared_ptr<ModelAPI_AttributeInteger> aLocationTypeAttr = std::dynamic_pointer_cast<
- ModelAPI_AttributeInteger>(myConstraint->data()->attribute(aLocationAttribute));
- updateArrows(DimensionAspect(), GetValue(), aTextSize,
- (SketcherPrs_Tools::LocationType)(aLocationTypeAttr->value()));
+ 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);
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);
}