From 55d3688bd8a884fe210380cec851a724e8d03332 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 23 Apr 2012 11:17:43 +0000 Subject: [PATCH] Bug IPAL22921: TC6.5.0: SplitAngle makes no modification --- src/GEOM_I/GEOM_IHealingOperations_i.cc | 3 +++ src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index 6926a8e19..84f1e2324 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -31,6 +31,7 @@ #include "utilities.h" #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" +#include #include @@ -109,6 +110,8 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ProcessShape (GEOM::GEOM_Object const GEOM::string_array& theParams, const GEOM::string_array& theValues) { + Kernel_Utils::Localizer loc; + GEOM::GEOM_Object_var aGEOMObject; // Set a not done flag diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 2f502b438..81321e9e0 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -41,6 +41,8 @@ #include #include +#include + #include #include @@ -460,14 +462,14 @@ const char* get_convert( const char* theParam, const QString& theValue ) // function : set_convert // purpose : conversion of angle values to degrees (non-angle values are not converted) //================================================================================= -const char* set_convert( const char* theParam, const char* theValue ) +QString set_convert( const char* theParam, const char* theValue ) { if ( !strcmp( theParam, "SplitAngle.Angle" ) ) { + Kernel_Utils::Localizer loc; double doubleValue = atof( theValue ) * 180. / M_PI; - TCollection_AsciiString str( doubleValue ); - return CORBA::string_dup( str.ToCString() ); + return QString::number( doubleValue ); } - return CORBA::string_dup( theValue ); + return QString( theValue ); } //================================================================================= @@ -499,8 +501,7 @@ void RepairGUI_ShapeProcessDlg::loadDefaults() for ( int j = 0; j < aParams->length(); j++ ) { QWidget* aCtrl = getControl( (const char*)aParams[j] ); - const char* aValue = set_convert( (const char*)aParams[j], aValues[j] ); - setValue( aCtrl, aValue ); + setValue( aCtrl, set_convert( (const char*)aParams[j], aValues[j] ) ); } } } -- 2.39.2