quick optimization patch (bytearray for images)

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index b330b3b0a63c67ba7b1f55fb1027546b7903b2d8..9c0743c0b3fcfd68c5f119daad92b4a5ca1bcdce 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
@@ -23,6 +23,7 @@
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Obstacle.h>
@@ -71,9 +72,9 @@ void HYDROGUI_ImportObstacleFromFileOp::startOperation()
   } else {
     myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
     myFileDlg->setWindowTitle( getName() );
-    myFileDlg->setFilter( tr("OBSTACLE_FILTER") );
+    myFileDlg->setNameFilter( tr("OBSTACLE_FILTER") );
     if ( !lastUsedFilter.isEmpty() ) {
-      myFileDlg->selectFilter( lastUsedFilter );
+      myFileDlg->selectNameFilter( lastUsedFilter );
     }
 
     connect( myFileDlg, SIGNAL( accepted() ),      this, SLOT( onApply()  ) );
@@ -117,7 +118,7 @@ bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
   } else if ( myFileDlg ) {
     // Get file name and file filter defined by the user
     aFileName = myFileDlg->selectedFile();
-    lastUsedFilter = myFileDlg->selectedFilter();
+    lastUsedFilter = myFileDlg->selectedNameFilter();
   }
 
   // Check the file name
@@ -152,8 +153,8 @@ bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
   if ( anObstacle.IsNull() ) {
     anObstacle = Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
 
-    anObstacle->SetFillingColor( HYDROData_Obstacle::DefaultFillingColor() );
-    anObstacle->SetBorderColor( HYDROData_Obstacle::DefaultBorderColor() );
+    anObstacle->SetFillingColor( anObstacle->DefaultFillingColor() );
+    anObstacle->SetBorderColor( anObstacle->DefaultBorderColor() );
   }
 
   if ( !anObstacle.IsNull() ) {
@@ -194,4 +195,4 @@ HYDROGUI_InputPanel* HYDROGUI_ImportObstacleFromFileOp::createInputPanel() const
   }
 
   return aPanel;
-}
\ No newline at end of file
+}