Issue 0020324: EDF 717 GEOM : Import IGES File

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index c8edd2681a5b0b6a9c425254a22a9bbf77812a3e..ed1f7a99e881eed3b574cd94c355bb92104508b7 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -3857,7 +3857,8 @@ Please, select face, shell or solid and try again</translation>
         </message>
         <message>
             <source>GEOM_SCALE_DIMENSIONS</source>
-            <translation>Length unit in the file is not a 'meter'. Do you want to scale a model?</translation>
+            <translation>Would you like to take into account the units?
+Otherwise the dimensions will be kept without modifications.</translation>
         </message>
     </context>
     <context>

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index a076bccf50a112febb87d80f2a7a5d7c1aaebfe1..2099f79caff09f314c74c9e98d20d1e9196c9357 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -722,11 +722,11 @@ bool GEOMToolsGUI::Import()
          needConvert = aUnitName.SubString( 6, aUnitName.Length() ) != "M";
 
        if ( needConvert ) {
-         if ( igesAnswer == SUIT_MessageBox::YesToAll ) {
+         if ( igesAnswer == SUIT_MessageBox::NoToAll ) {
            // converting for all files is already approved
            fileT = "IGES_SCALE";
          }
-         else if ( igesAnswer != SUIT_MessageBox::NoToAll ) {
+         else if ( igesAnswer != SUIT_MessageBox::YesToAll ) {
            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(),
@@ -739,10 +739,10 @@ bool GEOMToolsGUI::Import()
              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:
+             fileT = "IGES_SCALE";
            default:
              break;                       // scaling is rejected
            } // switch ( igesAnswer )