*/
//================================================================================
-bool StdMeshersGUI_StdHypothesisCreator::checkParams( QString& msg ) const
+bool StdMeshersGUI_StdHypothesisCreator::checkParams( QString& msg, QStringList& absentParams ) const
{
- if( !SMESHGUI_GenericHypothesisCreator::checkParams( msg ) )
+ if( !SMESHGUI_GenericHypothesisCreator::checkParams( msg, absentParams ) )
return false;
// check if object reference parameter is set, as it has no default value
widget< StdMeshersGUI_LayerDistributionParamWdg >( 0 );
ok = ( w && w->IsOk() );
}
+ else if ( hypType() == "QuadrangleParams" )
+ {
+ StdMeshersGUI_SubShapeSelectorWdg* w =
+ widget< StdMeshersGUI_SubShapeSelectorWdg >( 0 );
+ ok = ( w->GetListSize() > 0 );
+ }
return ok;
}
StdMeshers::StdMeshers_LocalLength::_narrow( hypothesis() );
h->SetLength( params[0].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetPrecision( params[1].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="MaxLength" )
{
StdMeshers::StdMeshers_MaxLength::_narrow( hypothesis() );
h->SetLength( params[0].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetUsePreestimatedLength( widget< QCheckBox >( 1 )->isChecked() );
if ( !h->HavePreestimatedLength() && !h->_is_equivalent( initParamsHypothesis() )) {
StdMeshers::StdMeshers_MaxLength_var hInit =
StdMeshers::StdMeshers_SegmentLengthAroundVertex::_narrow( hypothesis() );
h->SetLength( params[0].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="Arithmetic1D" )
{
widget< StdMeshersGUI_SubShapeSelectorWdg >( 2 );
h->SetStartLength( params[0].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetEndLength( params[1].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
if (w) {
h->SetReversedEdges( w->GetListOfIDs() );
- const char * entry = w->GetMainShapeEntry();
- h->SetObjectEntry( entry );
+ h->SetObjectEntry( w->GetMainShapeEntry() );
}
}
else if( hypType()=="FixedPoints1D" )
widget< StdMeshersGUI_SubShapeSelectorWdg >( 1 );
if (w1) {
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetPoints( w1->GetListOfPoints() );
h->SetNbSegments( w1->GetListOfSegments() );
}
if (w2) {
h->SetReversedEdges( w2->GetListOfIDs() );
- const char * entry = w2->GetMainShapeEntry();
- h->SetObjectEntry( entry );
+ h->SetObjectEntry( w2->GetMainShapeEntry() );
}
}
else if( hypType()=="MaxElementArea" )
{
StdMeshers::StdMeshers_MaxElementArea_var h =
StdMeshers::StdMeshers_MaxElementArea::_narrow( hypothesis() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetMaxElementArea( params[0].myValue.toDouble() );
}
else if( hypType()=="MaxElementVolume" )
StdMeshers::StdMeshers_MaxElementVolume::_narrow( hypothesis() );
h->SetMaxElementVolume( params[0].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="StartEndLength" )
{
widget< StdMeshersGUI_SubShapeSelectorWdg >( 2 );
h->SetStartLength( params[0].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetEndLength( params[1].myValue.toDouble() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
if (w) {
h->SetReversedEdges( w->GetListOfIDs() );
h->SetObjectEntry( w->GetMainShapeEntry() );
{
StdMeshers::StdMeshers_Deflection1D_var h =
StdMeshers::StdMeshers_Deflection1D::_narrow( hypothesis() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetDeflection( params[0].myValue.toDouble() );
}
else if( hypType()=="AutomaticLength" )
StdMeshers::StdMeshers_NumberOfLayers::_narrow( hypothesis() );
h->SetNumberOfLayers( params[0].myValue.toInt() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="LayerDistribution" )
{
widget< StdMeshersGUI_LayerDistributionParamWdg >( 0 );
h->SetLayerDistribution( w->GetHypothesis() );
- h->SetParameters(w->GetHypothesis()->GetParameters());
- w->GetHypothesis()->ClearParameters();
+ //h->SetParameters(w->GetHypothesis()->GetParameters());
+ //w->GetHypothesis()->ClearParameters();
}
else if( hypType()=="NumberOfLayers2D" )
{
StdMeshers::StdMeshers_NumberOfLayers2D::_narrow( hypothesis() );
h->SetNumberOfLayers( params[0].myValue.toInt() );
- h->SetParameters(SMESHGUI::JoinObjectParameters(aVariablesList));
+ //h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="LayerDistribution2D" )
{
widget< StdMeshersGUI_LayerDistributionParamWdg >( 0 );
h->SetLayerDistribution( w->GetHypothesis() );
- h->SetParameters(w->GetHypothesis()->GetParameters());
- w->GetHypothesis()->ClearParameters();
+ //h->SetParameters(w->GetHypothesis()->GetParameters());
+ //w->GetHypothesis()->ClearParameters();
}
else if( hypType()=="ProjectionSource1D" )
{
StdMeshersGUI_SubShapeSelectorWdg* w =
widget< StdMeshersGUI_SubShapeSelectorWdg >( 0 );
if (w) {
- if( w->GetListOfIDs()->length()>0 ) {
- h->SetTriaVertex( w->GetListOfIDs()[0] );
+ if( w->GetListSize() > 0 ) {
+ h->SetTriaVertex( w->GetListOfIDs()[0] ); // getlist must be called once
+ const char * entry = w->GetMainShapeEntry();
+ h->SetObjectEntry( entry );
}
- const char * entry = w->GetMainShapeEntry();
- h->SetObjectEntry( entry );
}
}
}
}
SMESH::SMESH_Hypothesis_var hyp = initParamsHypothesis();
- SMESH::ListOfParameters_var aParameters = hyp->GetLastParameters();
+ //SMESH::ListOfParameters_var aParameters = hyp->GetLastParameters();
+ SALOME::StringArray* aParameters = hyp->GetParameters();
if( hypType()=="LocalLength" )
{
StdMeshersGUI_SubShapeSelectorWdg* aDirectionWidget =
new StdMeshersGUI_SubShapeSelectorWdg();
- QString anEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry();
- if ( anEntry == "" )
- anEntry = h->GetObjectEntry();
- aDirectionWidget->SetMainShapeEntry( anEntry );
+ QString aGeomEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry();
+ QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
+ if ( aGeomEntry == "" )
+ aGeomEntry = h->GetObjectEntry();
+
+ aDirectionWidget->SetGeomShapeEntry( aGeomEntry );
+ aDirectionWidget->SetMainShapeEntry( aMainEntry );
aDirectionWidget->SetListOfIDs( h->GetReversedEdges() );
aDirectionWidget->showPreview( true );
customWidgets()->append ( aDirectionWidget );
StdMeshersGUI_SubShapeSelectorWdg* aDirectionWidget =
new StdMeshersGUI_SubShapeSelectorWdg();
QString anEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry();
+ QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
if ( anEntry == "" )
anEntry = h->GetObjectEntry();
- aDirectionWidget->SetMainShapeEntry( anEntry );
+ aDirectionWidget->SetGeomShapeEntry( anEntry );
+ aDirectionWidget->SetMainShapeEntry( aMainEntry );
aDirectionWidget->SetListOfIDs( h->GetReversedEdges() );
aDirectionWidget->showPreview( true );
customWidgets()->append ( aDirectionWidget );
StdMeshersGUI_SubShapeSelectorWdg* aDirectionWidget =
new StdMeshersGUI_SubShapeSelectorWdg();
QString anEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry();
+ QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
if ( anEntry == "" )
anEntry = h->GetObjectEntry();
- aDirectionWidget->SetMainShapeEntry( anEntry );
+ aDirectionWidget->SetGeomShapeEntry( anEntry );
+ aDirectionWidget->SetMainShapeEntry( aMainEntry );
aDirectionWidget->SetListOfIDs( h->GetReversedEdges() );
- aDirectionWidget->SetMainShapeEntry( h->GetObjectEntry() );
aDirectionWidget->showPreview( true );
customWidgets()->append ( aDirectionWidget );
}
//Set into not published hypo last variables
QStringList aLastVarsList;
for(int i = 0;i<aParameters->length();i++)
- aLastVarsList.append(QString(aParameters[i].in()));
+ aLastVarsList.append(QString(aParameters->operator[](i)));
+ /* ouv: temporarily disabled
if(!aLastVarsList.isEmpty())
- h->GetLayerDistribution()->SetLastParameters(SMESHGUI::JoinObjectParameters(aLastVarsList));
+ h->GetLayerDistribution()->SetLastParameters(aLastVarsList.join(":").toLatin1().constData());
+ */
customWidgets()->append
( new StdMeshersGUI_LayerDistributionParamWdg( h->GetLayerDistribution(), hypName(), dlg()));
//Set into not published hypo last variables
QStringList aLastVarsList;
for(int i = 0;i<aParameters->length();i++)
- aLastVarsList.append(QString(aParameters[i].in()));
+ aLastVarsList.append(QString(aParameters->operator[](i)));
+ /* ouv: temporarily disabled
if(!aLastVarsList.isEmpty())
- h->GetLayerDistribution()->SetLastParameters(SMESHGUI::JoinObjectParameters(aLastVarsList));
+ h->GetLayerDistribution()->SetLastParameters(aLastVarsList.join(":").toLatin1().constData());
+ */
customWidgets()->append
( new StdMeshersGUI_LayerDistributionParamWdg( h->GetLayerDistribution(), hypName(), dlg()));
aDirectionWidget->SetMaxSize(1);
aDirectionWidget->SetSubShType(TopAbs_VERTEX);
QString anEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry();
+ QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
if ( anEntry == "" )
anEntry = h->GetObjectEntry();
- aDirectionWidget->SetMainShapeEntry( anEntry );
+ aDirectionWidget->SetGeomShapeEntry( anEntry );
+ aDirectionWidget->SetMainShapeEntry( aMainEntry );
SMESH::long_array_var aVec = new SMESH::long_array;
int vertID = h->GetTriaVertex();
if(vertID>0) {
types.insert( "ProjectionSource3D", "PROJECTION_SOURCE_3D" );
types.insert( "NumberOfLayers", "NUMBER_OF_LAYERS" );
types.insert( "LayerDistribution", "LAYER_DISTRIBUTION" );
- types.insert( "NumberOfLayers2D", "NUMBER_OF_LAYERS" );
+ types.insert( "NumberOfLayers2D", "NUMBER_OF_LAYERS_2D" );
types.insert( "LayerDistribution2D", "LAYER_DISTRIBUTION" );
types.insert( "SegmentLengthAroundVertex", "SEGMENT_LENGTH_AROUND_VERTEX" );
types.insert( "MaxLength", "MAX_LENGTH" );
*/
//================================================================================
-bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::ListOfParameters_var theParameters,
+bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SALOME::StringArray* theParameters,
StdParam &theParams,
int order) const
{
- QString aVaribaleName = (theParameters->length() > order) ? QString(theParameters[order].in()) : QString("");
+ QString aVaribaleName = (theParameters->length() > order) ?
+ QString( CORBA::string_dup( theParameters->operator[]( order ) ) ) : QString("");
theParams.isVariable = !aVaribaleName.isEmpty();
if(theParams.isVariable)
theParams.myValue = aVaribaleName;