Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gni/evolution
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_NbSegmentsCreator.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
index e7f35d1f39119462ffda0131c73b5d032f862422..fa7a41b5ceda0e4e86ae18f3b61d5b7390d54349 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-379,16
+379,16
@@
bool StdMeshersGUI_NbSegmentsCreator::storeParamsToHypo( const NbSegmentsHypothe
try
{
if( isCreation() )
try
{
if( isCreation() )
- SMESH::SetName( SMESH::FindSObject( h ), h_data.myName.to
Latin1
().data() );
+ SMESH::SetName( SMESH::FindSObject( h ), h_data.myName.to
Utf8
().data() );
- h->SetVarParameter( h_data.myNbSegVarName.to
Latin1
().constData(), "SetNumberOfSegments" );
+ h->SetVarParameter( h_data.myNbSegVarName.to
Utf8
().constData(), "SetNumberOfSegments" );
h->SetNumberOfSegments( h_data.myNbSeg );
int distr = h_data.myDistrType;
if ( distr == 0 )
h->SetDistrType( distr ); // this is actually needed at non-uniform -> uniform switch
if( distr==1 ) {
h->SetNumberOfSegments( h_data.myNbSeg );
int distr = h_data.myDistrType;
if ( distr == 0 )
h->SetDistrType( distr ); // this is actually needed at non-uniform -> uniform switch
if( distr==1 ) {
- h->SetVarParameter( h_data.myScaleVarName.to
Latin1
().constData(), "SetScaleFactor" );
+ h->SetVarParameter( h_data.myScaleVarName.to
Utf8
().constData(), "SetScaleFactor" );
h->SetScaleFactor( h_data.myScale );
}
if( distr==2 || distr==3 )
h->SetScaleFactor( h_data.myScale );
}
if( distr==2 || distr==3 )
@@
-403,7
+403,7
@@
bool StdMeshersGUI_NbSegmentsCreator::storeParamsToHypo( const NbSegmentsHypothe
h->SetTableFunction( h_data.myTable );
if( distr==3 )
h->SetTableFunction( h_data.myTable );
if( distr==3 )
- h->SetExpressionFunction( h_data.myExpr.to
Latin1
().data() );
+ h->SetExpressionFunction( h_data.myExpr.to
Utf8
().data() );
//setting of function must follow after setConversionMode, because otherwise
//the function will be checked with old conversion mode, so that it may occurs
//unexpected errors for user
//setting of function must follow after setConversionMode, because otherwise
//the function will be checked with old conversion mode, so that it may occurs
//unexpected errors for user