Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Porting to ParaView 5.8
[modules/geom.git]
/
src
/
RepairGUI
/
RepairGUI_GlueDlg.cxx
diff --git
a/src/RepairGUI/RepairGUI_GlueDlg.cxx
b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index cf4d33ba9f904ba7906f47cf3e45c8638148c0e0..edf0015131212d4f02db68a3c750bfe1e93eabac 100644
(file)
--- a/
src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/
src/RepairGUI/RepairGUI_GlueDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-408,7
+408,7
@@
void RepairGUI_GlueDlg::enterEvent(QEvent*)
//=================================================================================
GEOM::GEOM_IOperations_ptr RepairGUI_GlueDlg::createOperation()
{
//=================================================================================
GEOM::GEOM_IOperations_ptr RepairGUI_GlueDlg::createOperation()
{
- return getGeomEngine()->GetIShapesOperations(
getStudyId()
);
+ return getGeomEngine()->GetIShapesOperations();
}
//=================================================================================
}
//=================================================================================
@@
-462,7
+462,7
@@
bool RepairGUI_GlueDlg::execute(ObjectList& objects)
{
QStringList aParameters;
aParameters << myTolEdt->text();
{
QStringList aParameters;
aParameters << myTolEdt->text();
- anObj->SetParameters(aParameters.join(":").to
Latin1
().constData());
+ anObj->SetParameters(aParameters.join(":").to
Utf8
().constData());
objects.push_back(anObj._retn());
}
objects.push_back(anObj._retn());
}
@@
-521,7
+521,7
@@
bool RepairGUI_GlueDlg::execute(ObjectList& objects)
if (!IsPreview()) {
QStringList aParameters;
aParameters << myTolEdt2->text();
if (!IsPreview()) {
QStringList aParameters;
aParameters << myTolEdt2->text();
- anObj->SetParameters(aParameters.join(":").to
Latin1
().constData());
+ anObj->SetParameters(aParameters.join(":").to
Utf8
().constData());
}
objects.push_back(anObj._retn());
}
}
objects.push_back(anObj._retn());
}
@@
-542,8
+542,7
@@
bool RepairGUI_GlueDlg::execute(ObjectList& objects)
// function : restoreSubShapes
// purpose :
//=================================================================================
// function : restoreSubShapes
// purpose :
//=================================================================================
-void RepairGUI_GlueDlg::restoreSubShapes(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::SObject_ptr theSObject)
+void RepairGUI_GlueDlg::restoreSubShapes( SALOMEDS::SObject_ptr theSObject)
{
if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
GEOM::find_shape_method aFindMethod = GEOM::FSM_GetInPlace;
{
if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
GEOM::find_shape_method aFindMethod = GEOM::FSM_GetInPlace;
@@
-551,7
+550,7
@@
void RepairGUI_GlueDlg::restoreSubShapes(SALOMEDS::Study_ptr theStudy,
aFindMethod = GEOM::FSM_GetInPlaceByHistory;
// empty list of arguments means that all arguments should be restored
aFindMethod = GEOM::FSM_GetInPlaceByHistory;
// empty list of arguments means that all arguments should be restored
- getGeomEngine()->RestoreSubShapesSO(
theStudy,
theSObject, GEOM::ListOfGO(),
+ getGeomEngine()->RestoreSubShapesSO( theSObject, GEOM::ListOfGO(),
aFindMethod, /*theInheritFirstArg=*/true,
mainFrame()->CheckBoxAddPrefix->isChecked());
}
aFindMethod, /*theInheritFirstArg=*/true,
mainFrame()->CheckBoxAddPrefix->isChecked());
}
@@
-592,7
+591,7
@@
void RepairGUI_GlueDlg::clearShapeBufferLocal(GEOM::GEOM_Object_ptr theObj)
//================================================================
// Function : onAccept
// Purpose : This method should be called from dialog's slots onOk() and onApply()
//================================================================
// Function : onAccept
// Purpose : This method should be called from dialog's slots onOk() and onApply()
-// It perf
ro
ms user input validation, then it
+// It perf
or
ms user input validation, then it
// performs a proper operation and manages transactions, etc.
//================================================================
bool RepairGUI_GlueDlg::onAcceptLocal()
// performs a proper operation and manages transactions, etc.
//================================================================
bool RepairGUI_GlueDlg::onAcceptLocal()
@@
-641,7
+640,7
@@
bool RepairGUI_GlueDlg::onAcceptLocal()
if (aName.isEmpty())
aName = GEOMBase::GetDefaultName(getPrefix(*it));
}
if (aName.isEmpty())
aName = GEOMBase::GetDefaultName(getPrefix(*it));
}
- addInStudy(*it, aName.to
Latin1
().data());
+ addInStudy(*it, aName.to
Utf8
().data());
display(*it, false);
}
display(*it, false);
}