-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
//
-// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_Hypotheses.cxx
// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
// SMESH includes
#define SPACING 6
#define MARGIN 11
-//To disable automatic genericobj management, the following line should be commented.
-//Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
-#define WITHGENERICOBJ
-
SMESHGUI_GenericHypothesisCreator::SMESHGUI_GenericHypothesisCreator( const QString& theHypType )
- : myHypType( theHypType ), myIsCreate( false ), myDlg( 0 )
+ : myToDeleteInitParamsHypo( false ),
+ myHypType( theHypType ),
+ myIsCreate( false ),
+ myDlg( 0 )
{
}
SMESHGUI_GenericHypothesisCreator::~SMESHGUI_GenericHypothesisCreator()
{
+ if ( myToDeleteInitParamsHypo && !myInitParamsHypo->_is_nil() )
+ myInitParamsHypo->UnRegister();
}
void SMESHGUI_GenericHypothesisCreator::setInitParamsHypothesis(SMESH::SMESH_Hypothesis_ptr hyp)
{
- if ( !CORBA::is_nil( hyp ) && hypType() == hyp->GetName() )
- myInitParamsHypo = SMESH::SMESH_Hypothesis::_duplicate( hyp );
+ if ( !CORBA::is_nil( hyp ) ) {
+ if ( myToDeleteInitParamsHypo && !myInitParamsHypo->_is_nil() )
+ myInitParamsHypo->UnRegister();
+ CORBA::String_var hypName = hyp->GetName();
+ if ( hypType() == hypName.in() )
+ {
+ myInitParamsHypo = SMESH::SMESH_Hypothesis::_duplicate( hyp );
+ myToDeleteInitParamsHypo = !SMESH::FindSObject( myInitParamsHypo );
+ }
+ }
}
void SMESHGUI_GenericHypothesisCreator::create( SMESH::SMESH_Hypothesis_ptr initParamsHyp,
if (isAlgo) {
SMESH::SMESH_Hypothesis_var anAlgo =
SMESH::CreateHypothesis( hypType(), theHypName, isAlgo );
-#ifdef WITHGENERICOBJ
if (!CORBA::is_nil(anAlgo))
- anAlgo->Destroy();
-#endif
+ anAlgo->UnRegister();
}
else {
SMESH::SMESH_Hypothesis_var aHypothesis =
SMESH::CreateHypothesis( hypType(), theHypName, false );
editHypothesis( aHypothesis.in(), theHypName, theParent, obj, slot );
-#ifdef WITHGENERICOBJ
if (!CORBA::is_nil(aHypothesis))
- aHypothesis->Destroy();
-#endif
+ aHypothesis->UnRegister();
}
}
{
myHypName = theHypName;
myHypo = SMESH::SMESH_Hypothesis::_duplicate( h );
-#ifdef WITHGENERICOBJ
myHypo->Register();
-#endif
SMESHGUI_HypothesisDlg* Dlg = new SMESHGUI_HypothesisDlg( this, theParent );
connect( Dlg, SIGNAL( finished( int ) ), this, SLOT( onDialogFinished( int ) ) );
Dlg->show();
Dlg->resize( Dlg->minimumSizeHint() );
}
- else
+ else {
emit finished( QDialog::Accepted );
+ delete myDlg;
+ }
}
QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame()
}
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
-#ifdef WITHGENERICOBJ
- myHypo->Destroy();
-#endif
+ myHypo->UnRegister();
myHypo = SMESH::SMESH_Hypothesis::_nil();
myInitParamsHypo = SMESH::SMESH_Hypothesis::_nil();
{
SalomeApp_IntSpinBox* sb = ( SalomeApp_IntSpinBox* )( *anIt );
item.myValue = sb->value();
+ item.myText = sb->text();
params.append( item );
}
else if( (*anIt)->inherits( "SalomeApp_DoubleSpinBox" ) )
{
SalomeApp_DoubleSpinBox* sb = ( SalomeApp_DoubleSpinBox* )( *anIt );
item.myValue = sb->value();
+ item.myText = sb->text();
params.append( item );
}
else if( (*anIt)->inherits( "QLineEdit" ) )
{
QLineEdit* line = ( QLineEdit* )( *anIt );
- item.myValue = line->text();
+ item.myValue = item.myText = line->text();
params.append( item );
}
else if ( getParamFromCustomWidget( item, *anIt ))
return res;
}
+QString SMESHGUI_GenericHypothesisCreator::getVariableName(const char* methodName) const
+{
+ SMESH::SMESH_Hypothesis_var h = hypothesis();
+ if ( !h->_is_nil() )
+ {
+ CORBA::String_var aVaribaleName = h->GetVarParameter( methodName );
+ return QString( aVaribaleName.in() );
+ }
+ return QString();
+}
QStringList SMESHGUI_GenericHypothesisCreator::getVariablesFromDlg() const
{
aHelpFileName = "segments_around_vertex_algo_page.html";
else if ( aHypType == "QuadrangleParams")
aHelpFileName = "a2d_meshing_hypo_page.html#hypo_quad_params_anchor";
+ else if ( aHypType == "ViscousLayers")
+ aHelpFileName = "additional_hypo_page.html#viscous_layers_anchor";
+ else if ( aHypType == "ViscousLayers2D")
+ aHelpFileName = "additional_hypo_page.html#viscous_layers_anchor";
else if ( aHypType == "ImportSource1D" || aHypType == "ImportSource2D")
aHelpFileName = "import_algos_page.html";
return aHelpFileName;
}
-
-
-
SMESHGUI_HypothesisDlg::SMESHGUI_HypothesisDlg( SMESHGUI_GenericHypothesisCreator* creator, QWidget* parent )
: QtxDialog( parent, false, true ),
myCreator( creator )
{
setAttribute(Qt::WA_DeleteOnClose, true);
- setMinimumSize( 300, height() );
+ // setMinimumSize( 300, height() );
// setFixedSize( 300, height() );
QVBoxLayout* topLayout = new QVBoxLayout( mainFrame() );
topLayout->setMargin( 0 );
{
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
if (app) {
- SMESHGUI* aSMESHGUI = dynamic_cast<SMESHGUI*>( app->activeModule() );
- app->onHelpContextModule(aSMESHGUI ? app->moduleName(aSMESHGUI->moduleName()) : QString(""), myHelpFileName);
+ QString name = "SMESH";
+ if(myCreator) {
+ QVariant pluginName = myCreator->property( PLUGIN_NAME );
+ if( pluginName.isValid() ) {
+ QString rootDir = pluginName.toString() + "PLUGIN_ROOT_DIR";
+ QString varValue = QString( getenv(rootDir.toLatin1().constData()));
+ if(!varValue.isEmpty())
+ name = pluginName.toString() + "PLUGIN";
+ }
+ }
+ app->onHelpContextModule(name, myHelpFileName);
}
else {
QString platform;
HypothesesSet::HypothesesSet( const QString& theSetName )
: myHypoSetName( theSetName ),
- myIsAlgo( false )
+ myIsAlgo( false ),
+ myIsCustom( false )
{
}
: myHypoSetName( theSetName ),
myHypoList( theHypoList ),
myAlgoList( theAlgoList ),
- myIsAlgo( false )
+ myIsAlgo( false ),
+ myIsCustom( false )
{
}
{
return list()->at(myIndex);
}
+
+void HypothesesSet::setIsCustom( bool isCustom )
+{
+ myIsCustom = isCustom;
+}
+
+bool HypothesesSet::getIsCustom() const
+{
+ return myIsCustom;
+}
+
+int HypothesesSet::maxDim() const
+{
+ HypothesesSet * thisSet = (HypothesesSet*) this;
+ int dim = -1;
+ for ( int isAlgo = 0; isAlgo < 2; ++isAlgo )
+ {
+ thisSet->init( isAlgo );
+ while ( thisSet->next(), thisSet->more() )
+ if ( HypothesisData* hypData = SMESH::GetHypothesisData( thisSet->current() ))
+ for ( int i = 0; i < hypData->Dim.count(); ++i )
+ dim = qMax( dim, hypData->Dim[i] );
+ }
+ return dim;
+}
