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
Copyright update 2022
[modules/geom.git]
/
src
/
OperationGUI
/
OperationGUI_PartitionDlg.cxx
diff --git
a/src/OperationGUI/OperationGUI_PartitionDlg.cxx
b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
index 19f0d2d4954e922789198a47e41c53150cab0c78..040bb3eeb0ace59ec489130c6543630de48d86fe 100644
(file)
--- a/
src/OperationGUI/OperationGUI_PartitionDlg.cxx
+++ b/
src/OperationGUI/OperationGUI_PartitionDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-317,7
+317,7
@@
void OperationGUI_PartitionDlg::SelectionIntoArgument()
//myListMaterials.length( 0 ); // obsolete
GEOM::shape_type type = GEOM::SHAPE;
//myListMaterials.length( 0 ); // obsolete
GEOM::shape_type type = GEOM::SHAPE;
- for (int i = 0; i < myListShapes.length(); i++)
+ for (int i = 0; i <
(int)
myListShapes.length(); i++)
type = qMin( type, myListShapes[i]->GetMaxShapeType() );
int idx = qMax( 0, GroupPoints->ComboBox1->findData( type ) );
GroupPoints->ComboBox1->setCurrentIndex( idx );
type = qMin( type, myListShapes[i]->GetMaxShapeType() );
int idx = qMax( 0, GroupPoints->ComboBox1->findData( type ) );
GroupPoints->ComboBox1->setCurrentIndex( idx );
@@
-330,7
+330,7
@@
void OperationGUI_PartitionDlg::SelectionIntoArgument()
if ( !myListTools.length() )
return;
else if ( myListTools.length() == 1 && getConstructorId() == 1 ) {
if ( !myListTools.length() )
return;
else if ( myListTools.length() == 1 && getConstructorId() == 1 ) {
- GEOM::GEOM_IMeasureOperations_var mOp = getGeomEngine()->GetIMeasureOperations(
getStudyId()
);
+ GEOM::GEOM_IMeasureOperations_var mOp = getGeomEngine()->GetIMeasureOperations();
GEOM::ListOfLong_var intList;
GEOM::ListOfDouble_var dblList;
GEOM::GEOM_IKindOfShape::shape_kind kind = mOp->KindOfShape( myListTools[0].in(), intList.out(), dblList.out() );
GEOM::ListOfLong_var intList;
GEOM::ListOfDouble_var dblList;
GEOM::GEOM_IKindOfShape::shape_kind kind = mOp->KindOfShape( myListTools[0].in(), intList.out(), dblList.out() );
@@
-428,7
+428,7
@@
void OperationGUI_PartitionDlg::enterEvent( QEvent* )
//=================================================================================
GEOM::GEOM_IOperations_ptr OperationGUI_PartitionDlg::createOperation()
{
//=================================================================================
GEOM::GEOM_IOperations_ptr OperationGUI_PartitionDlg::createOperation()
{
- return getGeomEngine()->GetIBooleanOperations(
getStudyId()
);
+ return getGeomEngine()->GetIBooleanOperations();
}
}
@@
-505,12
+505,11
@@
bool OperationGUI_PartitionDlg::execute (ObjectList& objects)
// function : restoreSubShapes
// purpose :
//=================================================================================
// function : restoreSubShapes
// purpose :
//=================================================================================
-void OperationGUI_PartitionDlg::restoreSubShapes( SALOMEDS::Study_ptr theStudy,
- SALOMEDS::SObject_ptr theSObject )
+void OperationGUI_PartitionDlg::restoreSubShapes( SALOMEDS::SObject_ptr theSObject )
{
if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
// empty list of arguments means that all arguments should be restored
{
if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
// empty list of arguments means that all arguments should be restored
- getGeomEngine()->RestoreSubShapesSO( theS
tudy, theS
Object, GEOM::ListOfGO(),
+ getGeomEngine()->RestoreSubShapesSO( theSObject, GEOM::ListOfGO(),
/*theFindMethod=*/GEOM::FSM_GetInPlaceByHistory,
/*theInheritFirstArg=*/myListShapes.length() == 1 && myListTools.length() == 0,
mainFrame()->CheckBoxAddPrefix->isChecked() ); // ? false
/*theFindMethod=*/GEOM::FSM_GetInPlaceByHistory,
/*theInheritFirstArg=*/myListShapes.length() == 1 && myListTools.length() == 0,
mainFrame()->CheckBoxAddPrefix->isChecked() ); // ? false
@@
-561,19
+560,19
@@
int OperationGUI_PartitionDlg::GetLimit() const
QList<GEOM::GeomObjPtr> OperationGUI_PartitionDlg::getSourceObjects()
{
QList<GEOM::GeomObjPtr> res;
QList<GEOM::GeomObjPtr> OperationGUI_PartitionDlg::getSourceObjects()
{
QList<GEOM::GeomObjPtr> res;
- for (int i = 0; i < myListShapes.length(); i++) {
+ for (int i = 0; i <
(int)
myListShapes.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]);
res << aGeomObjPtr;
}
GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]);
res << aGeomObjPtr;
}
- for (int i = 0; i < myListTools.length(); i++) {
+ for (int i = 0; i <
(int)
myListTools.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]);
res << aGeomObjPtr;
}
GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]);
res << aGeomObjPtr;
}
- for (int i = 0; i < myListRemoveInside.length(); i++) {
+ for (int i = 0; i <
(int)
myListRemoveInside.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListRemoveInside[i]);
res << aGeomObjPtr;
}
GEOM::GeomObjPtr aGeomObjPtr(myListRemoveInside[i]);
res << aGeomObjPtr;
}
- for (int i = 0; i < myListKeepInside.length(); i++) {
+ for (int i = 0; i <
(int)
myListKeepInside.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListKeepInside[i]);
res << aGeomObjPtr;
}
GEOM::GeomObjPtr aGeomObjPtr(myListKeepInside[i]);
res << aGeomObjPtr;
}