Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro

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

diff --git a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
index 0cb4447b63fa29a2659a6730fdc3ec4b7b23793f..d2d87f776334fbc9f396f007aaae5e10b7ed6e71 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -95,7 +95,7 @@ bool HYDROGUI_VisualStateOp::saveVisualState()
     if( aVisualState.IsNull() )
       return false;
 
-    QString aName = HYDROGUI_Tool::GenerateObjectName( module(), "VisualState" );
+    QString aName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_VISUAL_STATE_NAME" ) );
     aVisualState->SetName( aName );
   }
 
@@ -169,7 +169,7 @@ bool HYDROGUI_VisualStateOp::saveVisualState()
   //printf( "--- SetState -----------\n" );
   //printf( "%s\n", qPrintable( aState ) );
   //printf( "------------------------\n" );
-  aVisualState->SetState( aState );
+  aVisualState->SetState( aState.toStdString() );
 
   module()->update( UF_Model );
 
@@ -185,7 +185,7 @@ bool HYDROGUI_VisualStateOp::loadVisualState()
   if( aVisualState.IsNull() )
     return false;
 
-  QString aState = aVisualState->GetState();
+  QString aState = QString::fromStdString( aVisualState->GetState() );
   //printf( "--- GetState -----------\n" );
   //printf( "%s\n", qPrintable( aState ) );
   //printf( "------------------------\n" );