Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_StricklerTableOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_StricklerTableOp.cxx b/src/HYDROGUI/HYDROGUI_StricklerTableOp.cxx
index 7cecf388b79803958b5126490607b04b0eb3d59d..d47540a2879479bc315565c7dc6e9fcb7b0f2e93 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_StricklerTableOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StricklerTableOp.cxx
@@ -20,8 +20,11 @@
 
 #include "HYDROGUI_StricklerTableDlg.h"
 #include "HYDROGUI_DataObject.h"
+#include "HYDROGUI_Module.h"
+#include "HYDROGUI_OCCDisplayer.h"
 #include "HYDROGUI_Operations.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
+#include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Document.h>
 
@@ -33,7 +36,8 @@ HYDROGUI_StricklerTableOp::HYDROGUI_StricklerTableOp( HYDROGUI_Module* theModule
     : HYDROGUI_Operation( theModule ), 
     myType( theType )
 {
-    setName( isEdit() ? tr( "EDIT_STRICKLER_TABLE" ) : tr( "IMPORT_STRICKLER_TABLE" ) );
+    setName( isEdit() ? tr( "EDIT_STRICKLER_TABLE" ) :
+                        ( isImport() ? tr( "IMPORT_STRICKLER_TABLE" ) : tr( "EXPORT_STRICKLER_TABLE" ) ) );
 }
 
 HYDROGUI_StricklerTableOp::~HYDROGUI_StricklerTableOp()
@@ -56,15 +60,7 @@ void HYDROGUI_StricklerTableOp::startOperation()
         {
             // Edit selected Strickler table
             aPanel->setTableName( myObject->GetName() );
-
-            // Get Strickler table data from the data model
-            HYDROGUI_StricklerTableDlg::StricklerCoefficientList aData;
-            TColStd_SequenceOfExtendedString aTypes = myObject->GetTypes();
-            for ( int i = 1; i <= aTypes.Length(); i++ )
-                aData.append( HYDROGUI_StricklerTableDlg::StricklerCoefficient( HYDROGUI_Tool::ToQString( aTypes.Value( i ) ),
-                myObject->Get( aTypes.Value( i ), 0 ) ) );
-
-            aPanel->setData( aData );
+            aPanel->setGuiData( myObject );
         }
     }
     else if ( isExport() )
@@ -147,7 +143,7 @@ bool HYDROGUI_StricklerTableOp::processApply( int& theUpdateFlags, QString& theE
         bool res = false;
         QString aFilePath = aPanel->getFileName().simplified();
         if ( !aFilePath.isEmpty() )
-            res = aStricklerTableObj->Export( HYDROGUI_Tool::ToAsciiString( aFilePath ) );
+            res = aStricklerTableObj->Export( aFilePath );
         return res;
     }
 
@@ -158,18 +154,12 @@ bool HYDROGUI_StricklerTableOp::processApply( int& theUpdateFlags, QString& theE
     if( isEdit() )
     {
         // Get data from input panel's table and save it into data model object
-        aStricklerTableObj->Clear();
-        HYDROGUI_StricklerTableDlg::StricklerCoefficientList aData = aPanel->getData();
-        for ( HYDROGUI_StricklerTableDlg::StricklerCoefficientList::iterator it = aData.begin(); it != aData.end(); ++it )
-        {
-            const HYDROGUI_StricklerTableDlg::StricklerCoefficient& anInfo = *it;
-            aStricklerTableObj->Set( HYDROGUI_Tool::ToExtString( anInfo.myType ), anInfo.myCoefficient );
-        }
+      aPanel->getGuiData( aStricklerTableObj );
     }
     else
     {
         // Import data from Strickler table file into data model object
-        aStricklerTableObj->Import( HYDROGUI_Tool::ToAsciiString( aFilePath ) );
+        aStricklerTableObj->Import( aFilePath );
     }
 
     aStricklerTableObj->Update();
@@ -180,9 +170,11 @@ bool HYDROGUI_StricklerTableOp::processApply( int& theUpdateFlags, QString& theE
     {
         QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aStricklerTableObj );
         theBrowseObjectsEntries.append( anEntry );
+    } else {
+      module()->getOCCDisplayer()->SetToUpdateColorScale();
     }
 
-    theUpdateFlags |= UF_ObjBrowser;
+    theUpdateFlags |= UF_ObjBrowser | UF_OCCViewer;
 
     return true;
 }