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
Merge commit '4823245056426a9ccf9c7965daecf11459f58af5' into V9_11_BR
[modules/geom.git]
/
src
/
RepairGUI
/
RepairGUI_ShapeProcessDlg.cxx
diff --git
a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 9cc75064089b4c01fe1cad94c1dde81009508be9..395c12a9e5bff75b2ce452a07bdb96a82a105291 100644
(file)
--- a/
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
2
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
@@
-524,7
+524,7
@@
void RepairGUI_ShapeProcessDlg::loadDefaults()
anOp->GetShapeProcessParameters( anOperators, aParams, aValues );
// check the default items-operators
anOp->GetShapeProcessParameters( anOperators, aParams, aValues );
// check the default items-operators
- for ( int i = 0; i < anOperators->length(); i++ ) {
+ for ( int i = 0; i <
(int)
anOperators->length(); i++ ) {
//MESSAGE("-->"<<(const char*)anOperators[i]);
QList<QListWidgetItem*> items = myOpList->findItems ( (const char*)anOperators[i], Qt::MatchFixedString );
if ( items.count() )
//MESSAGE("-->"<<(const char*)anOperators[i]);
QList<QListWidgetItem*> items = myOpList->findItems ( (const char*)anOperators[i], Qt::MatchFixedString );
if ( items.count() )
@@
-541,7
+541,7
@@
void RepairGUI_ShapeProcessDlg::loadDefaults()
if ( aParams->length() != aValues->length() )
continue;
if ( aParams->length() != aValues->length() )
continue;
- for ( int j = 0; j < aParams->length(); j++ ) {
+ for ( int j = 0; j <
(int)
aParams->length(); j++ ) {
QWidget* aCtrl = getControl( (const char*)aParams[j] );
setValue( aCtrl, set_convert( (const char*)aParams[j], aValues[j] ));
}
QWidget* aCtrl = getControl( (const char*)aParams[j] );
setValue( aCtrl, set_convert( (const char*)aParams[j], aValues[j] ));
}
@@
-684,7
+684,7
@@
bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects )
*/// -----------
QStringList anErrorObjNames;
*/// -----------
QStringList anErrorObjNames;
- for ( int i = 0; i < myObjects->length(); i++ ) {
+ for ( int i = 0; i <
(int)
myObjects->length(); i++ ) {
GEOM::GEOM_Object_var obj = myObjects[i];
GEOM::GEOM_IHealingOperations_var anOper = GEOM::GEOM_IHealingOperations::_narrow( getOperation() );
GEOM::GEOM_Object_var anObj = anOper->ProcessShape( obj, anOperators, aParams, aValues );
GEOM::GEOM_Object_var obj = myObjects[i];
GEOM::GEOM_IHealingOperations_var anOper = GEOM::GEOM_IHealingOperations::_narrow( getOperation() );
GEOM::GEOM_Object_var anObj = anOper->ProcessShape( obj, anOperators, aParams, aValues );
@@
-696,10
+696,10
@@
bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects )
{
QStringList aParameters;
{
QStringList aParameters;
- for ( int i = 0; i < anOperators->length(); i++ )
+ for ( int i = 0; i <
(int)
anOperators->length(); i++ )
aParameters << QString( anOperators[i] );
aParameters << QString( anOperators[i] );
- for ( int i = 0; i < aParams->length(); i++ )
+ for ( int i = 0; i <
(int)
aParams->length(); i++ )
aParameters << QString( aParams[i] );
aParameters << getTexts( aParams );
aParameters << QString( aParams[i] );
aParameters << getTexts( aParams );
@@
-714,7
+714,7
@@
bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects )
if ( !anErrorObjNames.empty() )
MESSAGE( "ERRORS occurred while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
if ( !anErrorObjNames.empty() )
MESSAGE( "ERRORS occurred while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
- return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
+ return anErrorObjNames.size() <
(int)
myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
}
//=================================================================================
}
//=================================================================================
@@
-839,14
+839,14
@@
GEOM::string_array* RepairGUI_ShapeProcessDlg::getParameters( const GEOM::string
int i = 0, j = 0;
// calculate the length of parameters
int i = 0, j = 0;
// calculate the length of parameters
- for ( i = 0, j = 0; i < theOperators.length(); i++ )
+ for ( i = 0, j = 0; i <
(int)
theOperators.length(); i++ )
j += myValMap[ QString( theOperators[i].in() ) ].size();
// set the new length of parameters
aParams->length( j );
// fill the parameters
j += myValMap[ QString( theOperators[i].in() ) ].size();
// set the new length of parameters
aParams->length( j );
// fill the parameters
- for ( i = 0, j = 0; i < theOperators.length(); i++ ) {
+ for ( i = 0, j = 0; i <
(int)
theOperators.length(); i++ ) {
QStringList aParamLst = myValMap[ QString( theOperators[i].in() ) ];
foreach ( QString aParam, aParamLst ) {
aParams[j++] = CORBA::string_dup( aParam.toLatin1().constData() );
QStringList aParamLst = myValMap[ QString( theOperators[i].in() ) ];
foreach ( QString aParam, aParamLst ) {
aParams[j++] = CORBA::string_dup( aParam.toLatin1().constData() );
@@
-868,7
+868,7
@@
GEOM::string_array* RepairGUI_ShapeProcessDlg::getValues( const GEOM::string_arr
GEOM::string_array_var aValues = new GEOM::string_array();
aValues->length( theParams.length() );
GEOM::string_array_var aValues = new GEOM::string_array();
aValues->length( theParams.length() );
- for ( int i = 0; i < theParams.length(); i++ ) {
+ for ( int i = 0; i <
(int)
theParams.length(); i++ ) {
QWidget* aCtrl = getControl( (const char*)theParams[i] );
if ( aCtrl )
aValues[i] = get_convert( (const char*)theParams[i], getValue( aCtrl ));
QWidget* aCtrl = getControl( (const char*)theParams[i] );
if ( aCtrl )
aValues[i] = get_convert( (const char*)theParams[i], getValue( aCtrl ));
@@
-885,7
+885,7
@@
QStringList RepairGUI_ShapeProcessDlg::getTexts( const GEOM::string_array& thePa
{
QStringList aTexts;
{
QStringList aTexts;
- for ( int i = 0; i < theParams.length(); i++ ) {
+ for ( int i = 0; i <
(int)
theParams.length(); i++ ) {
QWidget* aCtrl = getControl( (const char*)theParams[i] );
if ( aCtrl )
{
QWidget* aCtrl = getControl( (const char*)theParams[i] );
if ( aCtrl )
{
@@
-1000,7
+1000,7
@@
QList<GEOM::GeomObjPtr> RepairGUI_ShapeProcessDlg::getSourceObjects()
{
QList<GEOM::GeomObjPtr> res;
GEOM::ListOfGO aListPtr(myObjects);
{
QList<GEOM::GeomObjPtr> res;
GEOM::ListOfGO aListPtr(myObjects);
- for (int i = 0; i < aListPtr.length(); i++) {
+ for (int i = 0; i <
(int)
aListPtr.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]);
res << aGeomObjPtr;
}
GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]);
res << aGeomObjPtr;
}