Temporary enable global selection for test of interactivity

This commit is contained in:
apl 2016-10-07 21:35:07 +03:00
parent 4f6d61c2cd
commit d95aebd2b3

View File

@ -222,7 +222,7 @@ void MeasureGUI_AnnotationDlg::Init()
myEditCurrentArgument = myShapeName; myEditCurrentArgument = myShapeName;
// default presentation values // default presentation values
myAnnotationProperties.Position = gp_Pnt(50, 50, 50); myAnnotationProperties.Position = gp_Pnt(250, 250, 250);
myAnnotationProperties.Text = tr("ANNOTATION_PREFIX"); myAnnotationProperties.Text = tr("ANNOTATION_PREFIX");
myAnnotationProperties.IsVisible = true; myAnnotationProperties.IsVisible = true;
myAnnotationProperties.IsScreenFixed = false; myAnnotationProperties.IsScreenFixed = false;
@ -242,7 +242,7 @@ void MeasureGUI_AnnotationDlg::Init()
connect(mySubShapeTypeCombo, SIGNAL(currentIndexChanged(int)), connect(mySubShapeTypeCombo, SIGNAL(currentIndexChanged(int)),
this, SLOT(onSubShapeTypeChange())); this, SLOT(onSubShapeTypeChange()));
SelectionIntoArgument(); //SelectionIntoArgument();
} }
else { // edition else { // edition
@ -256,10 +256,10 @@ void MeasureGUI_AnnotationDlg::Init()
//================================================================================= //=================================================================================
void MeasureGUI_AnnotationDlg::activateSelection() void MeasureGUI_AnnotationDlg::activateSelection()
{ {
globalSelection(GEOM_ALLSHAPES); //globalSelection(GEOM_ALLSHAPES);
if (!myShape->_is_nil() && mySelectionMode != TopAbs_SHAPE) { //if (!myShape->_is_nil() && mySelectionMode != TopAbs_SHAPE) {
localSelection(myShape.get(), mySelectionMode); // localSelection(myShape.get(), mySelectionMode);
} //}
} }
//================================================================================= //=================================================================================
@ -597,7 +597,7 @@ void MeasureGUI_AnnotationDlg::redisplayPreview()
//================================================================================= //=================================================================================
gp_Pnt MeasureGUI_AnnotationDlg::getAttachPoint(const TopoDS_Shape& theShape) gp_Pnt MeasureGUI_AnnotationDlg::getAttachPoint(const TopoDS_Shape& theShape)
{ {
gp_Pnt aPoint = gp_Pnt(300, 300, 300); gp_Pnt aPoint = gp_Pnt(0, 0, 0);
return aPoint; return aPoint;
} }