mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-15 18:18:35 +05:00
Improve Import operation: add "Yes To All", "No To All", "Cancel" operations to avoid repeating dialog boxes appearing
This commit is contained in:
parent
7e86c00595
commit
c2c6485e21
@ -663,9 +663,14 @@ bool GEOMToolsGUI::Import()
|
|||||||
|
|
||||||
QList< GEOM::GEOM_Object_var > objsForDisplay;
|
QList< GEOM::GEOM_Object_var > objsForDisplay;
|
||||||
|
|
||||||
|
|
||||||
// iterate through all selected files
|
// iterate through all selected files
|
||||||
for ( QStringList::ConstIterator it = fileNames.begin(); it != fileNames.end(); ++it ) {
|
|
||||||
QString fileName = *it;
|
SUIT_MessageBox::StandardButton igesAnswer = SUIT_MessageBox::NoButton;
|
||||||
|
SUIT_MessageBox::StandardButton acisAnswer = SUIT_MessageBox::NoButton;
|
||||||
|
|
||||||
|
for ( int i = 0; i < fileNames.count(); i++ ) {
|
||||||
|
QString fileName = fileNames[i];
|
||||||
|
|
||||||
if ( fileName.isEmpty() )
|
if ( fileName.isEmpty() )
|
||||||
continue;
|
continue;
|
||||||
@ -694,7 +699,6 @@ bool GEOMToolsGUI::Import()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GEOM_Operation* anOp = new GEOM_Operation( app, aInsOp.in() );
|
GEOM_Operation* anOp = new GEOM_Operation( app, aInsOp.in() );
|
||||||
try {
|
try {
|
||||||
app->putInfo( tr( "GEOM_PRP_LOADING" ).arg( SUIT_Tools::file( fileName, /*withExten=*/true ) ) );
|
app->putInfo( tr( "GEOM_PRP_LOADING" ).arg( SUIT_Tools::file( fileName, /*withExten=*/true ) ) );
|
||||||
@ -706,21 +710,52 @@ bool GEOMToolsGUI::Import()
|
|||||||
// skl 29.05.2009
|
// skl 29.05.2009
|
||||||
if ( aCurrentType == "IGES" ) {
|
if ( aCurrentType == "IGES" ) {
|
||||||
GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, "IGES_UNIT" );
|
GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, "IGES_UNIT" );
|
||||||
|
bool needConvert = false;
|
||||||
TCollection_AsciiString aUnitName = aInsOp->GetErrorCode();
|
TCollection_AsciiString aUnitName = aInsOp->GetErrorCode();
|
||||||
//cout<<"GUI: aUnitName = "<<aUnitName.ToCString()<<endl;
|
if ( aUnitName.SubString( 1, 4 ) == "UNIT" )
|
||||||
if( aUnitName.SubString(1,4) == "UNIT" ) {
|
needConvert = aUnitName.SubString( 6, aUnitName.Length() ) != "M";
|
||||||
aUnitName = aUnitName.SubString(6,aUnitName.Length());
|
|
||||||
if( aUnitName != "M" ) {
|
if ( needConvert ) {
|
||||||
if( SUIT_MessageBox::question( app->desktop(),
|
if ( igesAnswer == SUIT_MessageBox::YesToAll ) {
|
||||||
"Question",//tr("WRN_WARNING"),
|
// converting for all files is already approved
|
||||||
QObject::tr("GEOM_SCALE_DIMENSIONS"),
|
|
||||||
SUIT_MessageBox::Yes | SUIT_MessageBox::No,
|
|
||||||
SUIT_MessageBox::No) == SUIT_MessageBox::Yes ) {
|
|
||||||
fileT = "IGES_SCALE";
|
fileT = "IGES_SCALE";
|
||||||
}
|
}
|
||||||
}
|
else if ( igesAnswer != SUIT_MessageBox::NoToAll ) {
|
||||||
}
|
SUIT_MessageBox::StandardButtons btns = SUIT_MessageBox::Yes | SUIT_MessageBox::No;
|
||||||
}
|
if ( i < fileNames.count()-1 ) btns = btns | SUIT_MessageBox::YesToAll | SUIT_MessageBox::NoToAll;
|
||||||
|
igesAnswer = SUIT_MessageBox::question( app->desktop(),
|
||||||
|
"Question",//tr("WRN_WARNING"),
|
||||||
|
tr("GEOM_SCALE_DIMENSIONS"),
|
||||||
|
btns | SUIT_MessageBox::Cancel,
|
||||||
|
SUIT_MessageBox::No );
|
||||||
|
switch ( igesAnswer ) {
|
||||||
|
case SUIT_MessageBox::Cancel:
|
||||||
|
return false; // cancel (break) import operation
|
||||||
|
case SUIT_MessageBox::Yes:
|
||||||
|
case SUIT_MessageBox::YesToAll:
|
||||||
|
fileT = "IGES_SCALE";
|
||||||
|
break; // scaling is confirmed
|
||||||
|
case SUIT_MessageBox::No:
|
||||||
|
case SUIT_MessageBox::NoAll:
|
||||||
|
default:
|
||||||
|
break; // scaling is rejected
|
||||||
|
} // switch ( igesAnswer )
|
||||||
|
} // if ( igeAnswer != NoToAll )
|
||||||
|
} // if ( needConvert )
|
||||||
|
} // if ( aCurrentType == "IGES" )
|
||||||
|
else if ( aCurrentType == "ACIS" ) {
|
||||||
|
if ( acisAnswer != SUIT_MessageBox::YesToAll && acisAnswer != SUIT_MessageBox::NoToAll ) {
|
||||||
|
SUIT_MessageBox::StandardButtons btns = SUIT_MessageBox::Yes | SUIT_MessageBox::No;
|
||||||
|
if ( i < fileNames.count()-1 ) btns = btns | SUIT_MessageBox::YesToAll | SUIT_MessageBox::NoToAll;
|
||||||
|
acisAnswer = SUIT_MessageBox::question( app->desktop(),
|
||||||
|
"Question",//tr("WRN_WARNING"),
|
||||||
|
tr("GEOM_PUBLISH_NAMED_SHAPES"),
|
||||||
|
btns | SUIT_MessageBox::Cancel,
|
||||||
|
SUIT_MessageBox::No );
|
||||||
|
if ( acisAnswer == SUIT_MessageBox::Cancel )
|
||||||
|
return false; // cancel (break) import operation
|
||||||
|
} // if ( acisAnswer != YesToAll && acisAnswer != NoToAll )
|
||||||
|
} // else if ( aCurrentType == "ACIS" )
|
||||||
|
|
||||||
GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, fileT );
|
GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, fileT );
|
||||||
|
|
||||||
@ -737,14 +772,9 @@ bool GEOMToolsGUI::Import()
|
|||||||
objsForDisplay.append( anObj );
|
objsForDisplay.append( anObj );
|
||||||
|
|
||||||
if ( aCurrentType == "ACIS" ) {
|
if ( aCurrentType == "ACIS" ) {
|
||||||
if( SUIT_MessageBox::question( app->desktop(),
|
if ( acisAnswer == SUIT_MessageBox::Yes || acisAnswer == SUIT_MessageBox::YesToAll )
|
||||||
"Question",//tr("WRN_WARNING"),
|
|
||||||
tr("GEOM_PUBLISH_NAMED_SHAPES"),
|
|
||||||
SUIT_MessageBox::Yes | SUIT_MessageBox::No,
|
|
||||||
SUIT_MessageBox::No) == SUIT_MessageBox::Yes ) {
|
|
||||||
GeometryGUI::GetGeomGen()->PublishNamedShapesInStudy( aDSStudy, anObj );
|
GeometryGUI::GetGeomGen()->PublishNamedShapesInStudy( aDSStudy, anObj );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
anOp->commit();
|
anOp->commit();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user