-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011 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
//
-// 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 : StdMeshersGUI_StdHypothesisCreator.cxx
// Author : Alexander SOLOVYOV, Open CASCADE S.A.S.
#include <SMESHGUI_SpinBox.h>
#include <SMESHGUI_HypothesesUtils.h>
#include <SMESHGUI_Utils.h>
+#include <SMESHGUI_GEOMGenUtils.h>
#include <SMESH_TypeFilter.hxx>
#include <SMESH_NumberFilter.hxx>
/*!
* \brief creates a filter for selection of shapes of given dimension
* \param dim - dimension
- * \param subShapeType - required type of subshapes, number of which must be \a nbSubShapes
- * \param nbSubShapes - number of subshapes of given type
+ * \param subShapeType - required type of sub-shapes, number of which must be \a nbSubShapes
+ * \param nbSubShapes - number of sub-shapes of given type
* \param closed - required closeness flag of a shape
* \retval SUIT_SelectionFilter* - created filter
*/
{
StdMeshersGUI_ObjectReferenceParamWdg* w =
new StdMeshersGUI_ObjectReferenceParamWdg( filter, 0, /*multiSel=*/true);
- w->SetObjects( objEntries );
+ //RNV: Firstly, activate selection, then set objects
w->activateSelection();
+ w->SetObjects( objEntries );
return w;
}
ok = ( w->IsObjectSelected() );
if ( !ok ) w->SetObject( CORBA::Object::_nil() );
int nbAssocVert = ( hypType() == "ProjectionSource1D" ? 1 : 2 );
- for ( int i = 0; ok && i < nbAssocVert; i += 2)
+ int nbNonEmptyAssoc = 0;
+ for ( int i = 0; ok && i < nbAssocVert*2; i += 2)
{
QString srcV, tgtV;
StdMeshersGUI_ObjectReferenceParamWdg* w1 =
w1->SetObject( CORBA::Object::_nil() );
w2->SetObject( CORBA::Object::_nil() );
}
+ nbNonEmptyAssoc += !srcV.isEmpty();
+ }
+ if ( ok && nbNonEmptyAssoc == 1 && nbAssocVert == 2 )
+ {
+ // only one pair of VERTEXes is given for a FACE,
+ // then the FACE must have only one VERTEX
+ GEOM::GEOM_Object_var face = w->GetObject< GEOM::GEOM_Object >();
+
+ GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
+ _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ GEOM::GEOM_IShapesOperations_var shapeOp;
+ if ( !geomGen->_is_nil() && aStudy )
+ shapeOp = geomGen->GetIShapesOperations( aStudy->StudyId() );
+ if ( !shapeOp->_is_nil() )
+ {
+ GEOM::ListOfLong_var vertices =
+ shapeOp->GetAllSubShapesIDs (face, GEOM::VERTEX, /*isSorted=*/false);
+ ok = ( vertices->length() == 1 );
+ }
}
-
// Uninstall filters of StdMeshersGUI_ObjectReferenceParamWdg
if ( ok )
deactivateObjRefParamWdg( customWidgets() );
widget< StdMeshersGUI_LayerDistributionParamWdg >( 0 );
ok = ( w && w->IsOk() );
}
- else if ( hypType() == "QuadrangleParams" )
- {
- //StdMeshersGUI_SubShapeSelectorWdg* w =
- // widget< StdMeshersGUI_SubShapeSelectorWdg >( 0 );
- //ok = ( w->GetListSize() > 0 );
- //StdMeshersGUI_QuadrangleParamWdg* w =
- // widget< StdMeshersGUI_QuadrangleParamWdg >( 1 );
- }
+
return ok;
}
}
QString valueStr = stdParamValues( params );
- QStringList aVariablesList = getVariablesFromDlg();
+ //QStringList aVariablesList = getVariablesFromDlg();
if( res && !params.isEmpty() )
{
StdMeshers::StdMeshers_LocalLength_var h =
StdMeshers::StdMeshers_LocalLength::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetLength" );
h->SetLength( params[0].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[1].text(), "SetPrecision" );
h->SetPrecision( params[1].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="MaxLength" )
{
StdMeshers::StdMeshers_MaxLength_var h =
StdMeshers::StdMeshers_MaxLength::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetLength" );
h->SetLength( params[0].myValue.toDouble() );
- 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_var h =
StdMeshers::StdMeshers_SegmentLengthAroundVertex::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetLength" );
h->SetLength( params[0].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="Arithmetic1D" )
{
StdMeshersGUI_SubShapeSelectorWdg* w =
widget< StdMeshersGUI_SubShapeSelectorWdg >( 2 );
+ h->SetVarParameter( params[0].text(), "SetStartLength" );
h->SetStartLength( params[0].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[1].text(), "SetEndLength" );
h->SetEndLength( params[1].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
if (w) {
h->SetReversedEdges( w->GetListOfIDs() );
h->SetObjectEntry( w->GetMainShapeEntry() );
widget< StdMeshersGUI_SubShapeSelectorWdg >( 1 );
if (w1) {
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
h->SetPoints( w1->GetListOfPoints() );
h->SetNbSegments( w1->GetListOfSegments() );
}
{
StdMeshers::StdMeshers_MaxElementArea_var h =
StdMeshers::StdMeshers_MaxElementArea::_narrow( hypothesis() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[0].text(), "SetMaxElementArea" );
h->SetMaxElementArea( params[0].myValue.toDouble() );
}
else if( hypType()=="MaxElementVolume" )
StdMeshers::StdMeshers_MaxElementVolume_var h =
StdMeshers::StdMeshers_MaxElementVolume::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetMaxElementVolume" );
h->SetMaxElementVolume( params[0].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
}
else if( hypType()=="StartEndLength" )
{
StdMeshersGUI_SubShapeSelectorWdg* w =
widget< StdMeshersGUI_SubShapeSelectorWdg >( 2 );
+ h->SetVarParameter( params[0].text(), "SetStartLength" );
h->SetStartLength( params[0].myValue.toDouble() );
- h->SetParameters(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[1].text(), "SetEndLength" );
h->SetEndLength( params[1].myValue.toDouble() );
- 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(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[0].text(), "SetDeflection" );
h->SetDeflection( params[0].myValue.toDouble() );
}
else if( hypType()=="AutomaticLength" )
StdMeshers::StdMeshers_AutomaticLength_var h =
StdMeshers::StdMeshers_AutomaticLength::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetFineness" );
h->SetFineness( params[0].myValue.toDouble() );
}
else if( hypType()=="NumberOfLayers" )
StdMeshers::StdMeshers_NumberOfLayers_var h =
StdMeshers::StdMeshers_NumberOfLayers::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetNumberOfLayers" );
h->SetNumberOfLayers( params[0].myValue.toInt() );
- 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();
}
else if( hypType()=="NumberOfLayers2D" )
{
StdMeshers::StdMeshers_NumberOfLayers2D_var h =
StdMeshers::StdMeshers_NumberOfLayers2D::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetNumberOfLayers" );
h->SetNumberOfLayers( params[0].myValue.toInt() );
- 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();
}
else if( hypType()=="ProjectionSource1D" )
{
StdMeshers::StdMeshers_ViscousLayers_var h =
StdMeshers::StdMeshers_ViscousLayers::_narrow( hypothesis() );
+ h->SetVarParameter( params[0].text(), "SetTotalThickness" );
h->SetTotalThickness( params[0].myValue.toDouble() );
- /* */ h->SetParameters(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[1].text(), "SetNumberLayers" );
h->SetNumberLayers ( params[1].myValue.toInt() );
- /* */ h->SetParameters(aVariablesList.join(":").toLatin1().constData());
+ h->SetVarParameter( params[2].text(), "SetStretchFactor" );
h->SetStretchFactor ( params[2].myValue.toDouble() );
- /* */ h->SetParameters(aVariablesList.join(":").toLatin1().constData());
-
+
if ( StdMeshersGUI_SubShapeSelectorWdg* idsWg =
widget< StdMeshersGUI_SubShapeSelectorWdg >( 3 ))
{
h->SetIgnoreFaces( idsWg->GetListOfIDs() );
- //h->SetObjectEntry( idsWg->GetMainShapeEntry() );
}
}
else if( hypType()=="QuadrangleParams" )
//================================================================================
/*!
* \brief Return parameter values as SMESHGUI_GenericHypothesisCreator::StdParam
- * \param p - list of parameters
- * \retval bool - success flag
- *
- * Is called from SMESHGUI_GenericHypothesisCreator::buildStdFrame().
- * Parameters will be shown using "standard" controls:
- * Int by QtxIntSpinBox
- * Double by SMESHGUI_SpinBox
- * String by QLineEdit
- * getCustomWidget() allows to redefine control for a parameter
+ * \param p - list of parameters
+ * \retval bool - success flag
+ *
+ * Is called from SMESHGUI_GenericHypothesisCreator::buildStdFrame().
+ * Parameters will be shown using "standard" controls:
+ * Int by QtxIntSpinBox
+ * Double by SMESHGUI_SpinBox
+ * String by QLineEdit
+ * getCustomWidget() allows to redefine control for a parameter
*/
//================================================================================
p.append( item );
customWidgets()->append(0);
}
-
+
SMESH::SMESH_Hypothesis_var hyp = initParamsHypothesis();
SMESH::ListOfParameters_var aParameters = hyp->GetLastParameters();
{
StdMeshers::StdMeshers_LocalLength_var h =
StdMeshers::StdMeshers_LocalLength::_narrow( hyp );
-
+
item.myName = tr("SMESH_LOCAL_LENGTH_PARAM");
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetLength"))
item.myValue = h->GetLength();
p.append( item );
-
+
item.myName = tr("SMESH_LOCAL_LENGTH_PRECISION");
- if(!initVariableName(aParameters,item,1))
+ if(!initVariableName( hyp, item, "SetPrecision"))
item.myValue = h->GetPrecision();
p.append( item );
-
}
else if( hypType()=="MaxLength" )
{
}
item.myName = tr("SMESH_LOCAL_LENGTH_PARAM");
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetLength"))
item.myValue = h->GetLength();
p.append( item );
customWidgets()->append(0);
StdMeshers::StdMeshers_SegmentLengthAroundVertex::_narrow( hyp );
item.myName = tr("SMESH_LOCAL_LENGTH_PARAM");
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetLength"))
item.myValue = h->GetLength();
p.append( item );
StdMeshers::StdMeshers_Arithmetic1D::_narrow( hyp );
item.myName = tr( "SMESH_START_LENGTH_PARAM" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetStartLength" ))
item.myValue = h->GetLength( true );
p.append( item );
customWidgets()->append (0);
item.myName = tr( "SMESH_END_LENGTH_PARAM" );
- if(!initVariableName(aParameters,item,1))
+ if(!initVariableName( hyp, item, "SetEndLength" ))
item.myValue = h->GetLength( false );
p.append( item );
StdMeshers::StdMeshers_MaxElementArea::_narrow( hyp );
item.myName = tr( "SMESH_MAX_ELEMENT_AREA_PARAM" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetMaxElementArea" ))
item.myValue = h->GetMaxElementArea();
p.append( item );
StdMeshers::StdMeshers_MaxElementVolume::_narrow( hyp );
item.myName = tr( "SMESH_MAX_ELEMENT_VOLUME_PARAM" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetMaxElementVolume" ))
item.myValue = h->GetMaxElementVolume();
p.append( item );
}
item.myName = tr( "SMESH_START_LENGTH_PARAM" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetStartLength" ))
item.myValue = h->GetLength( true );
p.append( item );
customWidgets()->append(0);
item.myName = tr( "SMESH_END_LENGTH_PARAM" );
- if(!initVariableName(aParameters,item,1))
+ if(!initVariableName( hyp, item, "SetEndLength" ))
item.myValue = h->GetLength( false );
p.append( item );
customWidgets()->append(0);
StdMeshers::StdMeshers_Deflection1D::_narrow( hyp );
item.myName = tr( "SMESH_DEFLECTION1D_PARAM" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetDeflection" ))
item.myValue = h->GetDeflection();
p.append( item );
}
StdMeshers::StdMeshers_NumberOfLayers::_narrow( hyp );
item.myName = tr( "SMESH_NUMBER_OF_LAYERS" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetNumberOfLayers" ))
item.myValue = (int) h->GetNumberOfLayers();
p.append( item );
}
- else if( hypType()=="LayerDistribution" ) {
+ else if( hypType()=="LayerDistribution" )
+ {
StdMeshers::StdMeshers_LayerDistribution_var h =
StdMeshers::StdMeshers_LayerDistribution::_narrow( hyp );
item.myName = tr( "SMESH_LAYERS_DISTRIBUTION" ); p.append( item );
-
- //Set into not published hypo last variables
- QStringList aLastVarsList;
- for(int i = 0;i<aParameters->length();i++)
- aLastVarsList.append(QString(aParameters[i].in()));
-
- if(!aLastVarsList.isEmpty())
- h->GetLayerDistribution()->SetLastParameters(aLastVarsList.join(":").toLatin1().constData());
-
+ initVariableName( hyp, item, "SetLayerDistribution" );
customWidgets()->append
( new StdMeshersGUI_LayerDistributionParamWdg( h->GetLayerDistribution(), hypName(), dlg()));
}
- else if( hypType()=="NumberOfLayers2D" ) {
+ else if( hypType()=="NumberOfLayers2D" )
+ {
StdMeshers::StdMeshers_NumberOfLayers2D_var h =
StdMeshers::StdMeshers_NumberOfLayers2D::_narrow( hyp );
item.myName = tr( "SMESH_NUMBER_OF_LAYERS" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetNumberOfLayers" ))
item.myValue = (int) h->GetNumberOfLayers();
p.append( item );
}
- else if( hypType()=="LayerDistribution2D" ) {
+ else if( hypType()=="LayerDistribution2D" )
+ {
StdMeshers::StdMeshers_LayerDistribution2D_var h =
StdMeshers::StdMeshers_LayerDistribution2D::_narrow( hyp );
item.myName = tr( "SMESH_LAYERS_DISTRIBUTION" ); p.append( item );
-
- //Set into not published hypo last variables
- QStringList aLastVarsList;
- for(int i = 0;i<aParameters->length();i++)
- aLastVarsList.append(QString(aParameters[i].in()));
-
- if(!aLastVarsList.isEmpty())
- h->GetLayerDistribution()->SetLastParameters(aLastVarsList.join(":").toLatin1().constData());
-
+ initVariableName( hyp, item, "SetLayerDistribution" );
customWidgets()->append
( new StdMeshersGUI_LayerDistributionParamWdg( h->GetLayerDistribution(), hypName(), dlg()));
}
StdMeshers::StdMeshers_ViscousLayers::_narrow( hyp );
item.myName = tr( "SMESH_TOTAL_THICKNESS" );
- if(!initVariableName(aParameters,item,0))
+ if(!initVariableName( hyp, item, "SetTotalThickness" ))
item.myValue = h->GetTotalThickness();
p.append( item );
customWidgets()->append (0);
item.myName = tr( "SMESH_NUMBER_OF_LAYERS" );
- if(!initVariableName(aParameters,item,1))
+ if(!initVariableName( hyp, item, "SetNumberLayers" ))
item.myValue = h->GetNumberLayers();
p.append( item );
customWidgets()->append (0);
item.myName = tr( "SMESH_STRETCH_FACTOR" );
- if(!initVariableName(aParameters,item,2))
+ if(!initVariableName( hyp, item, "SetStretchFactor" ))
item.myValue = h->GetStretchFactor();
p.append( item );
customWidgets()->append (0);
types.insert( "MaxLength", "MAX_LENGTH" );
types.insert( "ViscousLayers", "VISCOUS_LAYERS" );
types.insert( "QuadrangleParams", "QUADRANGLE_PARAMS" );
+ types.insert( "CartesianParameters3D", "CARTESIAN_PARAMS" );
}
QString res;
*/
//================================================================================
-bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::ListOfParameters_var theParameters,
- StdParam &theParams,
- int order) const
+bool StdMeshersGUI_StdHypothesisCreator::initVariableName(SMESH::SMESH_Hypothesis_var theHyp,
+ StdParam & theParams,
+ const char* theMethod) const
{
- QString aVaribaleName = (theParameters->length() > order) ? QString(theParameters[order].in()) : QString("");
+ QString aVaribaleName = getVariableName( theMethod );
theParams.isVariable = !aVaribaleName.isEmpty();
- if(theParams.isVariable)
+ if (theParams.isVariable)
theParams.myValue = aVaribaleName;
return theParams.isVariable;
