From: isn <isn@opencascade.com>
Date: Wed, 24 Jun 2015 14:18:04 +0000 (+0300)
Subject: new resources; bug fixes; etc
X-Git-Tag: v1.4.2~34^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=302904f8788a5969a428dc931c3f02374f3fbe06;p=modules%2Fhydro.git

new resources; bug fixes; etc
---

diff --git a/src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
index 213f8c75..40a4b721 100644
--- a/src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
@@ -36,7 +36,7 @@ HYDROGUI_ImportLandCoverDlg::HYDROGUI_ImportLandCoverDlg( HYDROGUI_Module* theMo
 
   myFileNameGroup = new QGroupBox( tr( "IMPORT_LANDCOVER_FROM_FILE" ) );
 
-  QLabel* aFileNameLabel = new QLabel( tr( "LANCOVER_NAME" ), myFileNameGroup );
+  QLabel* aFileNameLabel = new QLabel( tr( "FILE_NAME" ), myFileNameGroup );
 
   myFileName = new QLineEdit( myFileNameGroup );
   myFileName->setReadOnly( true );
@@ -51,7 +51,7 @@ HYDROGUI_ImportLandCoverDlg::HYDROGUI_ImportLandCoverDlg( HYDROGUI_Module* theMo
   aFileNameLayout->addWidget( myFileName );
   aFileNameLayout->addWidget( aBrowseBtn );
 
-  myObjectNameGroup = new QGroupBox( tr( "FILE_NAME" ) );
+  myObjectNameGroup = new QGroupBox( tr( "LANDCOVER_NAME" ) );
 
   QLabel* aLandcoverNameLabel = new QLabel( tr( "NAME" ), myObjectNameGroup );
   myObjectName = new QLineEdit( myObjectNameGroup );
@@ -62,7 +62,7 @@ HYDROGUI_ImportLandCoverDlg::HYDROGUI_ImportLandCoverDlg( HYDROGUI_Module* theMo
   aLandcoverNameLayout->addWidget( aLandcoverNameLabel );
   aLandcoverNameLayout->addWidget( myObjectName );
 
-  QGroupBox* aPolygonsGroup = new QGroupBox( tr( "FOUND_POLYGONS_OF_SHP_FILE" ), mainFrame() );
+  QGroupBox* aPolygonsGroup = new QGroupBox( tr( "FOUNDED_POLYGONS" ), mainFrame() );
   myPolygons = new QListWidget( aPolygonsGroup );
   myPolygons->setSelectionMode( QListWidget::ExtendedSelection );
   myPolygons->setEditTriggers( QListWidget::NoEditTriggers );
diff --git a/src/HYDROGUI/HYDROGUI_ImportLandcoverOp.cxx b/src/HYDROGUI/HYDROGUI_ImportLandcoverOp.cxx
index bad1844c..79179eb3 100644
--- a/src/HYDROGUI/HYDROGUI_ImportLandcoverOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportLandcoverOp.cxx
@@ -84,6 +84,23 @@ HYDROGUI_ImportLandCoverOp::~HYDROGUI_ImportLandCoverOp()
 void HYDROGUI_ImportLandCoverOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
+
+  if ( !getPreviewManager() ) {
+    setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>( 
+                       module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
+  }
+
+  if ( !isApplyAndClose() ) {
+    return;
+  }
+
+  HYDROGUI_ImportLandCoverDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_ImportLandCoverDlg*>( inputPanel() );
+  if ( !aPanel ) {
+    return;
+  }
+
+  aPanel->reset();
 }
 
 
diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 2353cfe9..8f1d48b0 100644
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -2192,14 +2192,30 @@ file cannot be correctly imported for an Obstacle definition.</translation>
 
  <context>
     <name>HYDROGUI_ImportLandCoverDlg</name>
-    <message>
-      <source>IMPORT_LANDCOVER</source>
-      <translation>Import Land cover</translation>
-    </message>
     <message>
       <source>LANDCOVER_FILTER</source>
       <translation>Shape files (*.shp)</translation>
     </message>
+    <message>
+      <source>IMPORT_LANDCOVER_FROM_FILE</source>
+      <translation>Import land cover from file</translation>
+    </message>
+    <message>
+      <source>FILE_NAME</source>
+      <translation>File name</translation>
+    </message>
+    <message>
+      <source>LANDCOVER_NAME</source>
+      <translation>Land cover name</translation>
+    </message>
+    <message>
+      <source>NAME</source>
+      <translation>name:</translation>
+    </message>
+    <message>
+      <source>FOUNDED_POLYGONS</source>
+      <translation>Founded polygons:</translation>
+    </message>
     <message>
       <source>BAD_IMPORTED_LANDCOVER_FILES</source>
       <translation>Land cover import error</translation>
@@ -2210,7 +2226,18 @@ file cannot be correctly imported for an Obstacle definition.</translation>
     </message>
   </context>
 
-
+  <context>
+    <name>HYDROGUI_ImportLandCoverOp</name>
+    <message>
+      <source>IMPORT_LANDCOVER</source>
+      <translation>Import land cover</translation>
+    </message>
+    <message>
+      <source>DEFAULT_LANDCOVER_NAME</source>
+      <translation>Landcover_0</translation>
+    </message>
+  </context>
+ 
   <context>
     <name>HYDROGUI_ImportSinusXOp</name>
     <message>