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
Allow saving groups with non-ascii names.
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_NbSegmentsCreator.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
index cfb80164e4dc55852e8e69ba36b74a7640fc2745..35fdefcfad5ab7771a38850a23e9c958f50b8a18 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-25,7
+25,9
@@
// SMESH includes
//
#include "StdMeshersGUI_NbSegmentsCreator.h"
// SMESH includes
//
#include "StdMeshersGUI_NbSegmentsCreator.h"
-#include "StdMeshersGUI_DistrPreview.h"
+#ifndef DISABLE_PLOT2DVIEWER
+ #include "StdMeshersGUI_DistrPreview.h"
+#endif
#include "StdMeshersGUI_DistrTable.h"
#include "StdMeshersGUI_PropagationHelperWdg.h"
#include "StdMeshersGUI_SubShapeSelectorWdg.h"
#include "StdMeshersGUI_DistrTable.h"
#include "StdMeshersGUI_PropagationHelperWdg.h"
#include "StdMeshersGUI_SubShapeSelectorWdg.h"
@@
-64,7
+66,9
@@
StdMeshersGUI_NbSegmentsCreator::StdMeshersGUI_NbSegmentsCreator()
myDistr( 0 ),
myScale( 0 ),
myTable( 0 ),
myDistr( 0 ),
myScale( 0 ),
myTable( 0 ),
+#ifndef DISABLE_PLOT2DVIEWER
myPreview( 0 ),
myPreview( 0 ),
+#endif
myExpr( 0 ),
myConvBox( 0 ),
myConv( 0 ),
myExpr( 0 ),
myConvBox( 0 ),
myConv( 0 ),
@@
-90,9
+94,10
@@
bool StdMeshersGUI_NbSegmentsCreator::checkParams( QString& msg ) const
readParamsFromHypo( data_old );
readParamsFromWidgets( data_new );
bool res = storeParamsToHypo( data_new );
readParamsFromHypo( data_old );
readParamsFromWidgets( data_new );
bool res = storeParamsToHypo( data_new );
- storeParamsToHypo( data_old );
res = myNbSeg->isValid( msg, true ) && res;
res = myScale->isValid( msg, true ) && res;
res = myNbSeg->isValid( msg, true ) && res;
res = myScale->isValid( msg, true ) && res;
+ if ( !res )
+ storeParamsToHypo( data_old );
return res;
}
return res;
}
@@
-179,12
+184,14
@@
QFrame* StdMeshersGUI_NbSegmentsCreator::buildFrame()
// c) table
myTable = new StdMeshersGUI_DistrTableFrame( GroupC1 );
// c) table
myTable = new StdMeshersGUI_DistrTableFrame( GroupC1 );
+ myTable->setMinimumHeight(220);
myDistLayout->addWidget( myTable, 1, 0, 2, 1 );
myDistLayout->addWidget( myTable, 1, 0, 2, 1 );
+#ifndef DISABLE_PLOT2DVIEWER
// d) preview
myPreview = new StdMeshersGUI_DistrPreview( GroupC1, h.in() );
// d) preview
myPreview = new StdMeshersGUI_DistrPreview( GroupC1, h.in() );
- myPreview->setMinimumHeight(220);
myDistLayout->addWidget( myPreview, 1, 1, 2, 1 );
myDistLayout->addWidget( myPreview, 1, 1, 2, 1 );
+#endif
// 5) conversion (radiogroup)
myConvBox = new QGroupBox( tr( "SMESH_CONV_MODE" ), GroupC1 );
// 5) conversion (radiogroup)
myConvBox = new QGroupBox( tr( "SMESH_CONV_MODE" ), GroupC1 );
@@
-223,6
+230,7
@@
QFrame* StdMeshersGUI_NbSegmentsCreator::buildFrame()
lay->setStretchFactor( GroupC1, 1);
lay->setStretchFactor( myReversedEdgesBox, 1);
lay->setStretchFactor( GroupC1, 1);
lay->setStretchFactor( myReversedEdgesBox, 1);
+ myReversedEdgesHelper = 0;
if ( !aGeomEntry.isEmpty() || !aMainEntry.isEmpty() )
{
myReversedEdgesHelper = new StdMeshersGUI_PropagationHelperWdg( myDirectionWidget, fr, false );
if ( !aGeomEntry.isEmpty() || !aMainEntry.isEmpty() )
{
myReversedEdgesHelper = new StdMeshersGUI_PropagationHelperWdg( myDirectionWidget, fr, false );
@@
-287,13
+295,13
@@
QString StdMeshersGUI_NbSegmentsCreator::storeParams() const
case Regular :
valStr += tr("SMESH_DISTR_REGULAR");
break;
case Regular :
valStr += tr("SMESH_DISTR_REGULAR");
break;
- case Scale :
- valStr += tr("SMESH_NB_SEGMENTS_SCALE_PARAM") + " = " + QString::number( data.myScale );
\
+ case Scale :
+ valStr += tr("SMESH_NB_SEGMENTS_SCALE_PARAM") + " = " + QString::number( data.myScale );
break;
case TabFunc : {
//valStr += tr("SMESH_TAB_FUNC");
bool param = true;
break;
case TabFunc : {
//valStr += tr("SMESH_TAB_FUNC");
bool param = true;
- for(
int i=
0; i < data.myTable.length(); i++, param = !param ) {
+ for(
CORBA::ULong i =
0; i < data.myTable.length(); i++, param = !param ) {
if ( param )
valStr += "[";
valStr += QString::number( data.myTable[ i ]);
if ( param )
valStr += "[";
valStr += QString::number( data.myTable[ i ]);
@@
-371,15
+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 );
h->SetNumberOfSegments( h_data.myNbSeg );
- int distr = h_data.myDistrType;
- h->SetDistrType( distr );
+ int distr = h_data.myDistrType;
+ if ( distr == 0 )
+ h->SetDistrType( distr ); // this is actually needed at non-uniform -> uniform switch
if( distr==1 ) {
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 )
@@
-394,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
@@
-438,24
+447,27
@@
void StdMeshersGUI_NbSegmentsCreator::onValueChanged()
myTable->setData( arr ); //update data in table
}
myTable->setData( arr ); //update data in table
}
- myScale->set
Shown
( distr==1 );
- myLScale->set
Shown
( distr==1 );
- myReversedEdgesBox->set
Shown
( distr!=0 );
+ myScale->set
Visible
( distr==1 );
+ myLScale->set
Visible
( distr==1 );
+ myReversedEdgesBox->set
Visible
( distr!=0 );
if ( myReversedEdgesHelper ) {
myReversedEdgesHelper->Clear();
if ( myReversedEdgesHelper ) {
myReversedEdgesHelper->Clear();
- myReversedEdgesHelper->set
Shown
( distr!=0 );
+ myReversedEdgesHelper->set
Visible
( distr!=0 );
}
myDirectionWidget->ShowPreview( distr!=0 );
bool isFunc = distr==2 || distr==3;
}
myDirectionWidget->ShowPreview( distr!=0 );
bool isFunc = distr==2 || distr==3;
- myPreview->setShown( isFunc );
- myConvBox->setShown( isFunc );
+#ifndef DISABLE_PLOT2DVIEWER
+ myPreview->setVisible( isFunc );
+#endif
+ myConvBox->setVisible( isFunc );
- myTable->set
Shown
( distr==2 );
- myExpr->set
Shown
( distr==3 );
- myLExpr->set
Shown
( distr==3 );
- myInfo->set
Shown
( distr==3);
+ myTable->set
Visible
( distr==2 );
+ myExpr->set
Visible
( distr==3 );
+ myLExpr->set
Visible
( distr==3 );
+ myInfo->set
Visible
( distr==3);
+#ifndef DISABLE_PLOT2DVIEWER
//change of preview
int nbSeg = myNbSeg->value();
if( distr==2 ) //preview for table-described function
//change of preview
int nbSeg = myNbSeg->value();
if( distr==2 ) //preview for table-described function
@@
-469,6
+481,7
@@
void StdMeshersGUI_NbSegmentsCreator::onValueChanged()
if( isFunc )
myPreview->setConversion( StdMeshersGUI_DistrPreview::Conversion( myConv->checkedId() ) );
if( isFunc )
myPreview->setConversion( StdMeshersGUI_DistrPreview::Conversion( myConv->checkedId() ) );
+#endif
if ( (QtxComboBox*)sender() == myDistr && dlg() ) {
QApplication::instance()->processEvents();
if ( (QtxComboBox*)sender() == myDistr && dlg() ) {
QApplication::instance()->processEvents();