From 150279528896d191d74352723061d1af72f3e6f5 Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Tue, 12 Nov 2013 10:15:38 +0000
Subject: [PATCH] =?utf8?q?Fix=20for=20the=20bug=20#55:=20unnecessary=20?=
 =?utf8?q?=C2=93=5F=C2=94=20in=20object=20names.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/HYDROGUI/HYDROGUI_DataModel.cxx       | 12 ++++++------
 src/HYDROGUI/resources/HYDROGUI_msg_en.ts | 24 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx
index b15b99ac..97ec1607 100644
--- a/src/HYDROGUI/HYDROGUI_DataModel.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx
@@ -224,7 +224,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
   if( aDocument.IsNull() )
     return;
 
-  LightApp_DataObject* anImageRootObj = createObject( aRootObj, partitionName( KIND_IMAGE ) );
+  LightApp_DataObject* anImageRootObj = createObject( aRootObj, tr( partitionName( KIND_IMAGE ).toAscii() ) );
 
   HYDROData_Iterator anIterator( aDocument, KIND_IMAGE );
   for( ; anIterator.More(); anIterator.Next() )
@@ -235,7 +235,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
       createObject( anImageRootObj, anImageObj );
   }
 
-  LightApp_DataObject* aBathymetryRootObj = createObject( aRootObj, partitionName( KIND_BATHYMETRY ) );
+  LightApp_DataObject* aBathymetryRootObj = createObject( aRootObj, tr( partitionName( KIND_BATHYMETRY ).toAscii() ) );
 
   anIterator = HYDROData_Iterator( aDocument, KIND_BATHYMETRY );
   for( ; anIterator.More(); anIterator.Next() )
@@ -246,7 +246,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
       createObject( aBathymetryRootObj, aBathymetryObj );
   }
 
-  LightApp_DataObject* aPolylineRootObj = createObject( aRootObj, partitionName( KIND_POLYLINE ) );
+  LightApp_DataObject* aPolylineRootObj = createObject( aRootObj, tr( partitionName( KIND_POLYLINE ).toAscii() ) );
 
   anIterator = HYDROData_Iterator( aDocument, KIND_POLYLINE );
   for( ; anIterator.More(); anIterator.Next() )
@@ -257,7 +257,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
       createObject( aPolylineRootObj, aPolylineObj );
   }
 
-  LightApp_DataObject* aZonesRootObj = createObject( aRootObj, partitionName( KIND_IMMERSIBLE_ZONE ) );
+  LightApp_DataObject* aZonesRootObj = createObject( aRootObj, tr( partitionName( KIND_IMMERSIBLE_ZONE ).toAscii() ) );
 
   anIterator = HYDROData_Iterator( aDocument, KIND_IMMERSIBLE_ZONE );
   for( ; anIterator.More(); anIterator.Next() )
@@ -268,7 +268,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
       createObject( aZonesRootObj, aZoneObj );
   }
 
-  LightApp_DataObject* aCalculRootObj = createObject( aRootObj, partitionName( KIND_CALCULATION ) );
+  LightApp_DataObject* aCalculRootObj = createObject( aRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) );
 
   anIterator = HYDROData_Iterator( aDocument, KIND_CALCULATION );
   for( ; anIterator.More(); anIterator.Next() )
@@ -279,7 +279,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
       createObject( aCalculRootObj, aCalculObj );
   }
 
-  LightApp_DataObject* aVisualStateRootObj = createObject( aRootObj, partitionName( KIND_VISUAL_STATE ) );
+  LightApp_DataObject* aVisualStateRootObj = createObject( aRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) );
 
   anIterator = HYDROData_Iterator( aDocument, KIND_VISUAL_STATE );
   for( ; anIterator.More(); anIterator.Next() )
diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index e2fcf529..87f38ff7 100644
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -3,6 +3,30 @@
   
   <context>
     <name>@default</name>
+    <message>
+      <source>IMAGES</source>
+      <translation>IMAGES</translation>
+    </message>
+    <message>
+      <source>POLYLINES</source>
+      <translation>POLYLINES</translation>
+    </message>
+    <message>
+      <source>VISUAL_STATES</source>
+      <translation>VISUAL STATES</translation>
+    </message>
+    <message>
+      <source>BATHYMETRIES</source>
+      <translation>BATHYMETRIES</translation>
+    </message>
+    <message>
+      <source>CALCULATION_CASES</source>
+      <translation>CALCULATION CASES</translation>
+    </message>
+    <message>
+      <source>IMMERSIBLE_ZONES</source>
+      <translation>IMMERSIBLE ZONES</translation>
+    </message>
     <message>
       <source>BATHYMETRY_FILTER</source>
       <translation>Bathymetry files (*.xyz);;All files (*.* *)</translation>
-- 
2.39.2