-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// 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.
+// 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.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : SALOMEDSImpl_ScalarVariable.cxx
//
#include "SALOMEDSImpl_ScalarVariable.hxx"
#include "SALOMEDSImpl_GenericVariable.hxx"
+#include "Basics_Utils.hxx"
#include <iostream>
#include <cstdlib>
#include <cstdio>
+#define OLDSTUDY_COMPATIBILITY
+
//============================================================================
/*! Function : SALOMEDSImpl_ScalarVariable
* Purpose :
*/
//============================================================================
std::string SALOMEDSImpl_ScalarVariable::Save() const{
+ Kernel_Utils::Localizer loc;
+
char buffer[255];
switch(Type())
{
}
case SALOMEDSImpl_GenericVariable::STRING_VAR:
{
- sprintf(buffer, "\"%s\"", myStrValue.c_str());
+ sprintf(buffer, "%s", myStrValue.c_str());
break;
}
default:break;
//============================================================================
std::string SALOMEDSImpl_ScalarVariable::SaveToScript() const
{
+ Kernel_Utils::Localizer loc;
+
char buffer[255];
switch(Type())
{
}
case SALOMEDSImpl_GenericVariable::BOOLEAN_VAR:
{
- if((bool)myValue)
- sprintf(buffer, "%s", "True");
- else
- sprintf(buffer, "%s", "False");
+ sprintf(buffer, "%s", ((bool)myValue) ? "True" : "False");
break;
}
case SALOMEDSImpl_GenericVariable::STRING_VAR:
//============================================================================
void SALOMEDSImpl_ScalarVariable::Load(const std::string& theStrValue)
{
- double aValue = atof(theStrValue.c_str());
- setValue(aValue);
+ Kernel_Utils::Localizer loc;
+
+ std::string strCopy = theStrValue;
+ if ( Type() == SALOMEDSImpl_GenericVariable::STRING_VAR ) {
+#ifdef OLDSTUDY_COMPATIBILITY
+ if (strCopy.size() > 1 && strCopy[0] == '\"' && strCopy[strCopy.size()-1] == '\"')
+ strCopy = strCopy.substr(1, strCopy.size()-2);
+#endif // OLDSTUDY_COMPATIBILITY
+ setStringValue( strCopy );
+ }
+ else {
+#ifdef OLDSTUDY_COMPATIBILITY
+ int dotpos = strCopy.find(',');
+ if (dotpos != std::string::npos)
+ strCopy.replace(dotpos, 1, ".");
+#endif // OLDSTUDY_COMPATIBILITY
+ double aValue = atof(strCopy.c_str());
+ setValue(aValue);
+ }
}