X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTransformationGUI%2FTransformationGUI_ScaleDlg.cxx;h=83ed162b1453c49facfc6b506ccc57222d2a8f7b;hb=c52059c3f88890a936705180edf2bd54e88e160b;hp=e43169ba3488f1e448dbb2f627af00bce5f66f1a;hpb=4ca9a3e8ad7d51cca077aa417b30f5f94108bd7a;p=modules%2Fgeom.git diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index e43169ba3..83ed162b1 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -325,7 +325,7 @@ void TransformationGUI_ScaleDlg::SetEditCurrentArgument() else if (send == PushButton2) { myEditCurrentArgument = LineEdit2; - localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); + localSelection(TopAbs_VERTEX); PushButton1->setDown(false); LineEdit1->setEnabled(false); @@ -392,7 +392,7 @@ void TransformationGUI_ScaleDlg::SetDoubleSpinBoxStep(double step) //================================================================================= GEOM::GEOM_IOperations_ptr TransformationGUI_ScaleDlg::createOperation() { - return getGeomEngine()->GetITransformOperations(getStudyId()); + return getGeomEngine()->GetITransformOperations(); } //================================================================================= @@ -442,7 +442,7 @@ bool TransformationGUI_ScaleDlg::execute (ObjectList& objects) anObj = anOper->ScaleShapeCopy(myObjects[i].get(), myPoint.get(), SpinBox_FX->value()); if (!anObj->_is_nil()) { if(!IsPreview()) - anObj->SetParameters(SpinBox_FX->text().toLatin1().constData()); + anObj->SetParameters(SpinBox_FX->text().toUtf8().constData()); objects.push_back(anObj._retn()); } } @@ -466,15 +466,16 @@ bool TransformationGUI_ScaleDlg::execute (ObjectList& objects) { anObj = anOper->ScaleShapeAlongAxesCopy(myObjects[i].get(), myPoint.get(), SpinBox_FX->value(), SpinBox_FY->value(), SpinBox_FZ->value()); - if (!anObj->_is_nil()) + if (!anObj->_is_nil()) { if(!IsPreview()) { QStringList aParameters; aParameters<text(); aParameters<text(); aParameters<text(); - anObj->SetParameters(aParameters.join(":").toLatin1().constData()); + anObj->SetParameters(aParameters.join(":").toUtf8().constData()); } objects.push_back(anObj._retn()); + } } } else @@ -500,12 +501,11 @@ bool TransformationGUI_ScaleDlg::execute (ObjectList& objects) // function : restoreSubShapes // purpose : //================================================================================= -void TransformationGUI_ScaleDlg::restoreSubShapes (SALOMEDS::Study_ptr theStudy, - SALOMEDS::SObject_ptr theSObject) +void TransformationGUI_ScaleDlg::restoreSubShapes (SALOMEDS::SObject_ptr theSObject) { if (mainFrame()->CheckBoxRestoreSS->isChecked()) { // empty list of arguments means that all arguments should be restored - getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, GEOM::ListOfGO(), + getGeomEngine()->RestoreSubShapesSO(theSObject, GEOM::ListOfGO(), /*theFindMethod=*/GEOM::FSM_Transformed, /*theInheritFirstArg=*/true, mainFrame()->CheckBoxAddPrefix->isChecked());