X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportObstacleFromFileOp.cxx;h=9c0743c0b3fcfd68c5f119daad92b4a5ca1bcdce;hb=fce3f1240b6161d7cb837344078e5943b90eca65;hp=6dba55c1adc20667ce80251f71b4104bfa1df7f5;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index 6dba55c1..9c0743c0 100644
--- a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -27,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>
@@ -75,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()  ) );
@@ -121,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
@@ -156,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() ) {
@@ -198,4 +195,4 @@ HYDROGUI_InputPanel* HYDROGUI_ImportObstacleFromFileOp::createInputPanel() const
   }
 
   return aPanel;
-}
\ No newline at end of file
+}