X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportObstacleFromFileOp.cxx;h=301e826d7e3088d3bf0baaf83ffec34057e64f55;hb=f34b90e9e4e02ba65419134d5d37a2e42aecfabf;hp=0fc2e3e58fd7a0720cd868538cea38ee472a1b71;hpb=12ee350be54f45d4e9429bf588fab0ca520ff62e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
index 0fc2e3e5..301e826d 100644
--- a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.cxx
@@ -22,7 +22,7 @@
 
 #include "HYDROGUI_ImportObstacleFromFileOp.h"
 
-#include "HYDROGUI_ObstacleDlg.h"
+#include "HYDROGUI_GeomObjectDlg.h"
 
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
@@ -61,17 +61,17 @@ void HYDROGUI_ImportObstacleFromFileOp::startOperation()
   HYDROGUI_Operation::startOperation();
 
   // Get panel
-  HYDROGUI_ObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_ObstacleDlg*>( inputPanel() );
+  HYDROGUI_GeomObjectDlg* aPanel = ::qobject_cast<HYDROGUI_GeomObjectDlg*>( inputPanel() );
 
   if ( aPanel ) {
     // Reset the panel state
     aPanel->reset();
 
     // Pass the existing obstacle names to the panel
-    QStringList anObstacles = 
+    QStringList anObstacleNames = 
       HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_OBSTACLE );
 
-    aPanel->setObstacleNames( anObstacles );
+    aPanel->setObjectNames( anObstacleNames );
   } else {
     myFileDlg = new SUIT_FileDlg( module()->getApp()->desktop(), true );
     myFileDlg->setWindowTitle( getName() );
@@ -105,12 +105,12 @@ bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
   Handle(HYDROData_Obstacle) anObstacle;
 
   // Get panel
-  HYDROGUI_ObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_ObstacleDlg*>( inputPanel() );
+  HYDROGUI_GeomObjectDlg* aPanel = ::qobject_cast<HYDROGUI_GeomObjectDlg*>( inputPanel() );
   if ( aPanel ) {
     // Get file name and obstacle name defined by the user
     aFileName = aPanel->getFileName();
       
-    QString anEditedName = aPanel->getEditedObstacleName().simplified();
+    QString anEditedName = aPanel->getEditedObjectName().simplified();
 
     // Get obstacle to edit
     if ( !anEditedName.isEmpty() ) {
@@ -134,7 +134,7 @@ bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
   }
 
   // Check obstacle name
-  anObstacleName = aPanel->getObstacleName().simplified();
+  anObstacleName = aPanel->getObjectName().simplified();
   if ( anObstacleName.isEmpty() ) {
     theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
     return false;
@@ -154,6 +154,9 @@ bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
   // If the obstacle for edit is null - create new obstacle object
   if ( anObstacle.IsNull() ) {
     anObstacle = Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
+
+    anObstacle->SetFillingColor( HYDROData_Obstacle::DefaultFillingColor() );
+    anObstacle->SetBorderColor( HYDROData_Obstacle::DefaultBorderColor() );
   }
 
   if ( !anObstacle.IsNull() ) {
@@ -167,9 +170,12 @@ bool HYDROGUI_ImportObstacleFromFileOp::processApply( int& theUpdateFlags,
         anObstacle->SetName( anObstacleName );
       }
 
+      anObstacle->Update();
+
       // Set operation status
       anIsOk = true;
-      theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;;
+      module()->setIsToUpdate( anObstacle );
+      theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
     } else {
       theErrorMsg = tr( "BAD_IMPORTED_OBSTACLE_FILE" ).arg( aFileName );
     }
@@ -182,7 +188,8 @@ HYDROGUI_InputPanel* HYDROGUI_ImportObstacleFromFileOp::createInputPanel() const
 {
   HYDROGUI_InputPanel* aPanel = 0;
   if ( myIsToShowPanel ) {
-    aPanel = new HYDROGUI_ObstacleDlg( module(), getName(), true );
+    aPanel = new HYDROGUI_GeomObjectDlg( module(), getName(), 
+                                         tr( "DEFAULT_OBSTACLE_NAME" ), true );
   }
 
   return aPanel;