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
updated copyright message
[modules/geom.git]
/
src
/
MeasureGUI
/
MeasureGUI_FastCheckIntersectionsDlg.cxx
diff --git
a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
index ff075bc175156e697c45a31aabd9ff16cace68bd..6a72250fb249e7d5d339fb552b18781b5ced67b6 100644
(file)
--- a/
src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
+++ b/
src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-252,7
+252,7
@@
void MeasureGUI_FastCheckIntersectionsDlg::onCompute()
TopExp::MapShapes(aSelShape2, anIndices2);
//Sub-shapes of 1st Object
TopExp::MapShapes(aSelShape2, anIndices2);
//Sub-shapes of 1st Object
- for (int i = 0; i < myInters1->length(); i++) {
+ for (int i = 0; i <
(int)
myInters1->length(); i++) {
TopoDS_Shape aSubShape = anIndices1.FindKey(myInters1[i]);
QString aType = GEOMBase::GetShapeTypeString(aSubShape);
if (!aType.isEmpty())
TopoDS_Shape aSubShape = anIndices1.FindKey(myInters1[i]);
QString aType = GEOMBase::GetShapeTypeString(aSubShape);
if (!aType.isEmpty())
@@
-262,7
+262,7
@@
void MeasureGUI_FastCheckIntersectionsDlg::onCompute()
myShapeList1->selectAll();
//Sub-shapes of second Object
myShapeList1->selectAll();
//Sub-shapes of second Object
- for (int i = 0; i < myInters2->length(); i++) {
+ for (int i = 0; i <
(int)
myInters2->length(); i++) {
TopoDS_Shape aSubShape = anIndices2.FindKey(myInters2[i]);
QString aType = GEOMBase::GetShapeTypeString(aSubShape);
if (!aType.isEmpty())
TopoDS_Shape aSubShape = anIndices2.FindKey(myInters2[i]);
QString aType = GEOMBase::GetShapeTypeString(aSubShape);
if (!aType.isEmpty())
@@
-360,7
+360,7
@@
bool MeasureGUI_FastCheckIntersectionsDlg::extractPrefix() const
//=================================================================================
GEOM::GEOM_IOperations_ptr MeasureGUI_FastCheckIntersectionsDlg::createOperation()
{
//=================================================================================
GEOM::GEOM_IOperations_ptr MeasureGUI_FastCheckIntersectionsDlg::createOperation()
{
- return getGeomEngine()->GetIMeasureOperations(
getStudyId()
);
+ return getGeomEngine()->GetIMeasureOperations();
}
//=================================================================================
}
//=================================================================================
@@
-413,10
+413,10
@@
void MeasureGUI_FastCheckIntersectionsDlg::SetEditCurrentArgument()
// function : OnGaps()
// purpose :
//=================================================================================
// function : OnGaps()
// purpose :
//=================================================================================
-void MeasureGUI_FastCheckIntersectionsDlg::OnGaps(bool cheked)
+void MeasureGUI_FastCheckIntersectionsDlg::OnGaps(bool che
c
ked)
{
clear();
{
clear();
- myTolerance->setEnabled(cheked);
+ myTolerance->setEnabled(che
c
ked);
}
//=================================================================================
// function : SelectionIntoArgument
}
//=================================================================================
// function : SelectionIntoArgument
@@
-475,7
+475,7
@@
bool MeasureGUI_FastCheckIntersectionsDlg::findIntersections()
GEOM::GEOM_IMeasureOperations::_narrow(getOperation());
bool isOK = true;
GEOM::GEOM_IMeasureOperations::_narrow(getOperation());
bool isOK = true;
- bool HasInte;
+ bool HasInte
= false
;
try {
HasInte = anOper->FastIntersect(myObj1.get(), myObj2.get(), getTolerance(), getDeflection(), myInters1, myInters2);
}
try {
HasInte = anOper->FastIntersect(myObj1.get(), myObj2.get(), getTolerance(), getDeflection(), myInters1, myInters2);
}
@@
-611,7
+611,7
@@
GEOM::ListOfGO_var MeasureGUI_FastCheckIntersectionsDlg::getLstObjFromListSelect
}
if (myShapesOper->_is_nil())
}
if (myShapesOper->_is_nil())
- myShapesOper = getGeomEngine()->GetIShapesOperations(
getStudyId()
);
+ myShapesOper = getGeomEngine()->GetIShapesOperations();
GEOM::ListOfGO_var aObjLstCreate = myShapesOper->MakeSubShapes(anObj.get(), anArray);
GEOM::ListOfGO_var aObjLstCreate = myShapesOper->MakeSubShapes(anObj.get(), anArray);
@@
-623,7
+623,7
@@
GEOM::ListOfGO_var MeasureGUI_FastCheckIntersectionsDlg::getLstObjFromListSelect
for (i=0, anIter = aObjLstExist.begin(); anIter != aObjLstExist.end(); i++, ++anIter) {
anObjLst[i] = *anIter;
}
for (i=0, anIter = aObjLstExist.begin(); anIter != aObjLstExist.end(); i++, ++anIter) {
anObjLst[i] = *anIter;
}
- for (int j = 0; j < aObjLstCreate->length(); j++) {
+ for (int j = 0; j <
(int)
aObjLstCreate->length(); j++) {
anObjLst[aObjLstExist.size()+j]=aObjLstCreate[j];
}
return anObjLst._retn();
anObjLst[aObjLstExist.size()+j]=aObjLstCreate[j];
}
return anObjLst._retn();
@@
-645,11
+645,11
@@
bool MeasureGUI_FastCheckIntersectionsDlg::execute(ObjectList& objects)
//Collect general intersection list
aCompList->length(nbObj);
int i;
//Collect general intersection list
aCompList->length(nbObj);
int i;
- for (i = 0; i < aList1->length(); i++) {
+ for (i = 0; i <
(int)
aList1->length(); i++) {
GEOMBase::PublishSubObject( aList1[i] );
aCompList[i]=aList1[i];
}
GEOMBase::PublishSubObject( aList1[i] );
aCompList[i]=aList1[i];
}
- for (int j = 0; j < aList2->length(); j++) {
+ for (int j = 0; j <
(int)
aList2->length(); j++) {
GEOMBase::PublishSubObject( aList2[j] );
aCompList[i+j]=aList2[j];
}
GEOMBase::PublishSubObject( aList2[j] );
aCompList[i+j]=aList2[j];
}