X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Hypotheses.cxx;h=257cb657c30fcdea74830fa724786f274f826c64;hb=0a237be4b91b6db526b340c534f40a385d6d65ab;hp=c42a940d42b86f20858508d74fe75298c74592c3;hpb=f5016d85b7b4b88623723027a1585c6414c4dc66;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx index c42a940d4..257cb657c 100644 --- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx +++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -6,7 +6,7 @@ // 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. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -29,17 +29,22 @@ #include "SMESHGUI_HypothesesUtils.h" #include "SMESHGUI_Utils.h" #include "SMESHGUI_SpinBox.h" +#include "SMESHGUI_VTKUtils.h" +#include "SMESH_Actor.h" // SALOME KERNEL includes #include #include // SALOME GUI includes -#include +#include #include +#include #include -#include +#include #include +#include +#include // Qt includes #include @@ -51,71 +56,70 @@ #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, const QString& theHypName, QWidget* parent, QObject* obj, const QString& slot ) { - MESSAGE( "Creation of hypothesis with initial params" ); setInitParamsHypothesis( initParamsHyp ); create( false, theHypName, parent, obj, slot ); } -void SMESHGUI_GenericHypothesisCreator::create( bool isAlgo, +void SMESHGUI_GenericHypothesisCreator::create( bool isAlgo, const QString& theHypName, - QWidget* theParent, QObject* obj, const QString& slot ) + QWidget* theParent, + QObject* obj, + const QString& slot ) { - MESSAGE( "Creation of hypothesis" ); - myIsCreate = true; // Create hypothesis/algorithm if (isAlgo) { SMESH::SMESH_Hypothesis_var anAlgo = SMESH::CreateHypothesis( hypType(), theHypName, isAlgo ); -#ifdef WITHGENERICOBJ - if (!CORBA::is_nil(anAlgo)) - anAlgo->UnRegister(); -#endif + anAlgo.out(); // avoid unused variable warning } 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->UnRegister(); -#endif } } void SMESHGUI_GenericHypothesisCreator::edit( SMESH::SMESH_Hypothesis_ptr theHypothesis, - const QString& theHypName, + const QString& theHypName, QWidget* theParent, QObject* obj, const QString& slot ) { if( CORBA::is_nil( theHypothesis ) ) return; - MESSAGE("Edition of hypothesis"); - myIsCreate = false; editHypothesis( theHypothesis, theHypName, theParent, obj, slot ); @@ -128,9 +132,7 @@ void SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_ { 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 ) ) ); @@ -152,7 +154,7 @@ void SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_ } else { emit finished( QDialog::Accepted ); - delete myDlg; + delete myDlg; } } @@ -182,6 +184,7 @@ QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame() { QLabel* lab = new QLabel( (*anIt).myName, GroupC1 ); GroupC1Layout->addWidget( lab, i, 0 ); + myParamLabels << lab; QWidget* w = getCustomWidget( *anIt, GroupC1, i ); if ( !w ) @@ -210,7 +213,7 @@ QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame() case QVariant::String: { if((*anIt).isVariable) { - _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + _PTR(Study) aStudy = SMESH::getStudy(); QString aVar = (*anIt).myValue.toString(); if(aStudy->IsInteger(aVar.toLatin1().constData())){ SalomeApp_IntSpinBox* sb = new SalomeApp_IntSpinBox( GroupC1 ); @@ -239,7 +242,9 @@ QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame() } } break; - } + + default:; + } // switch( (*anIt).myValue.type() ) if( w ) { @@ -247,6 +252,12 @@ QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame() changeWidgets().append( w ); } } + if ( QWidget* w = getHelperWidget() ) + { + w->setParent( fr ); + w->move( QPoint( 0, 0 ) ); + lay->addWidget( w ); + } return fr; } @@ -265,12 +276,20 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result ) bool res = result==QDialog::Accepted; if( res ) { - /*QString paramValues = */storeParams(); + try + { + SUIT_OverrideCursor wc; + storeParams(); // No longer needed since NoteBook appears and "Value" OB field shows names of variable -// if ( !paramValues.isEmpty() ) { -// if ( _PTR(SObject) SHyp = SMESH::FindSObject( myHypo )) -// SMESH::SetValue( SHyp, paramValues ); -// } + // QString paramValues = storeParams(); + // if ( !paramValues.isEmpty() ) { + // if ( _PTR(SObject) SHyp = SMESH::FindSObject( myHypo )) + // SMESH::SetValue( SHyp, paramValues ); + // } + } + catch ( const SALOME::SALOME_Exception& S_ex ) { + SalomeApp_Tools::QtCatchCorbaException( S_ex ); + } } changeWidgets().clear(); @@ -279,7 +298,7 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result ) { //remove just created hypothesis _PTR(SObject) aHypSObject = SMESH::FindSObject( myHypo ); - _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + _PTR(Study) aStudy = SMESH::getStudy(); if( aStudy && !aStudy->GetProperties()->IsLocked() ) { _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder(); @@ -290,7 +309,7 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result ) { SMESH::SObjectList listSOmesh = SMESH::GetMeshesUsingAlgoOrHypothesis( myHypo ); if( listSOmesh.size() > 0 ) - for( int i = 0; i < listSOmesh.size(); i++ ) + for( size_t i = 0; i < listSOmesh.size(); i++ ) { _PTR(SObject) submSO = listSOmesh[i]; SMESH::SMESH_Mesh_var aMesh = SMESH::SObjectToInterface( submSO ); @@ -298,13 +317,13 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result ) if( !aSubMesh->_is_nil() ) aMesh = aSubMesh->GetFather(); _PTR(SObject) meshSO = SMESH::FindSObject( aMesh ); - SMESH::ModifiedMesh( meshSO, false, aMesh->NbNodes()==0); + SMESH_Actor* actor = SMESH::FindActorByEntry( meshSO->GetID().c_str() ); + if( actor && actor->GetVisibility() ) + actor->Update(); } } SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 ); -#ifdef WITHGENERICOBJ myHypo->UnRegister(); -#endif myHypo = SMESH::SMESH_Hypothesis::_nil(); myInitParamsHypo = SMESH::SMESH_Hypothesis::_nil(); @@ -312,6 +331,9 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result ) myDlg->close(); //delete myDlg; since WA_DeleteOnClose==true myDlg = 0; + if (SVTK_ViewWindow* vf = SMESH::GetCurrentVtkView()) { + vf->Repaint(); + } emit finished( result ); } @@ -386,8 +408,8 @@ QString SMESHGUI_GenericHypothesisCreator::stdParamValues( const ListOfStdParams { QString valueStr = ""; ListOfStdParams::const_iterator param = params.begin(), aLast = params.end(); - uint len0 = 0; - for( int i=0; param!=aLast; param++, i++ ) + int len0 = 0; + for ( ; param != aLast; param++ ) { if ( valueStr.length() > len0 ) { valueStr += "; "; @@ -465,6 +487,22 @@ SMESHGUI_GenericHypothesisCreator::ListOfWidgets& SMESHGUI_GenericHypothesisCrea return myParamWidgets; } +//================================================================================ +/*! + * \brief Returns a QLabel of a spesified parameter. + * If isCreation(), the 1st label (supposed to be "Name") is not countered. + */ +//================================================================================ + +QLabel* SMESHGUI_GenericHypothesisCreator::getLabel(int i) const +{ + if ( isCreation() ) + i++; + if ( i < myParamLabels.size() ) + return (QLabel*) myParamLabels.at(i); + return NULL; +} + QtxDialog* SMESHGUI_GenericHypothesisCreator:: dlg() const { return myDlg; @@ -499,6 +537,17 @@ QWidget* SMESHGUI_GenericHypothesisCreator::getCustomWidget( const StdParam & /* { return 0; } +//================================================================================ +/*! + * \brief Returns a widget representing not a hypothesis parameter but some helper widget + */ +//================================================================================ + +QWidget* SMESHGUI_GenericHypothesisCreator::getHelperWidget() const +{ + return 0; +} + bool SMESHGUI_GenericHypothesisCreator::getParamFromCustomWidget( StdParam&, QWidget* ) const { return false; @@ -533,47 +582,53 @@ QString SMESHGUI_GenericHypothesisCreator::helpPage() const QString aHypType = hypType(); QString aHelpFileName = ""; if ( aHypType == "LocalLength" ) - aHelpFileName = "a1d_meshing_hypo_page.html#average_length_anchor"; + aHelpFileName = "1d_meshing_hypo.html#average-length-anchor"; else if ( aHypType == "MaxLength" ) - aHelpFileName = "a1d_meshing_hypo_page.html#max_length_anchor"; + aHelpFileName = "1d_meshing_hypo.html#max-length-anchor"; else if ( aHypType == "Arithmetic1D") - aHelpFileName = "a1d_meshing_hypo_page.html#arithmetic_1d_anchor"; + aHelpFileName = "1d_meshing_hypo.html#arithmetic-1d-anchor"; + else if ( aHypType == "GeometricProgression") + aHelpFileName = "1d_meshing_hypo.html#geometric-1d-anchor"; else if ( aHypType == "FixedPoints1D") - aHelpFileName = "a1d_meshing_hypo_page.html#fixed_points_1d_anchor"; + aHelpFileName = "1d_meshing_hypo.html#fixed-points-1d-anchor"; else if ( aHypType == "MaxElementArea") - aHelpFileName = "a2d_meshing_hypo_page.html#max_element_area_anchor"; + aHelpFileName = "2d_meshing_hypo.html#max-element-area-anchor"; else if ( aHypType == "MaxElementVolume") - aHelpFileName = "max_element_volume_hypo_page.html"; + aHelpFileName = "max_element_volume_hypo.html"; else if ( aHypType == "StartEndLength") - aHelpFileName = "a1d_meshing_hypo_page.html#start_and_end_length_anchor"; + aHelpFileName = "1d_meshing_hypo.html#start-and-end-length-anchor"; else if ( aHypType == "Deflection1D") - aHelpFileName = "a1d_meshing_hypo_page.html#deflection_1d_anchor"; + aHelpFileName = "1d_meshing_hypo.html#deflection-1d-anchor"; + else if ( aHypType == "Adaptive1D") + aHelpFileName = "1d_meshing_hypo.html#adaptive-1d-anchor"; else if ( aHypType == "AutomaticLength") - aHelpFileName = "a1d_meshing_hypo_page.html#automatic_length_anchor"; + aHelpFileName = "1d_meshing_hypo.html#automatic-length-anchor"; else if ( aHypType == "NumberOfSegments") - aHelpFileName = "a1d_meshing_hypo_page.html#number_of_segments_anchor"; + aHelpFileName = "1d_meshing_hypo.html#number-of-segments-anchor"; else if ( aHypType == "ProjectionSource1D") - aHelpFileName = "projection_algos_page.html"; + aHelpFileName = "projection_algos.html"; else if ( aHypType == "ProjectionSource2D") - aHelpFileName = "projection_algos_page.html"; + aHelpFileName = "projection_algos.html"; else if ( aHypType == "ProjectionSource3D") - aHelpFileName = "projection_algos_page.html"; + aHelpFileName = "projection_algos.html"; else if ( aHypType == "NumberOfLayers") - aHelpFileName = "radial_prism_algo_page.html"; + aHelpFileName = "radial_prism_algo.html"; else if ( aHypType == "NumberOfLayers2D") - aHelpFileName = "radial_quadrangle_1D2D_algo_page.html"; + aHelpFileName = "radial_quadrangle_1D2D_algo.html"; else if ( aHypType == "LayerDistribution") - aHelpFileName = "radial_prism_algo_page.html"; + aHelpFileName = "radial_prism_algo.html"; else if ( aHypType == "LayerDistribution2D") - aHelpFileName = "radial_quadrangle_1D2D_algo_page.html"; + aHelpFileName = "radial_quadrangle_1D2D_algo.html"; else if ( aHypType == "SegmentLengthAroundVertex") - aHelpFileName = "segments_around_vertex_algo_page.html"; + aHelpFileName = "segments_around_vertex_algo.html"; else if ( aHypType == "QuadrangleParams") - aHelpFileName = "a2d_meshing_hypo_page.html#hypo_quad_params_anchor"; + aHelpFileName = "2d_meshing_hypo.html#hypo-quad-params-anchor"; else if ( aHypType == "ViscousLayers") - aHelpFileName = "additional_hypo_page.html#viscous_layers_anchor"; + aHelpFileName = "additional_hypo.html#viscous-layers-anchor"; + else if ( aHypType == "ViscousLayers2D") + aHelpFileName = "additional_hypo.html#viscous-layers-anchor"; else if ( aHypType == "ImportSource1D" || aHypType == "ImportSource2D") - aHelpFileName = "import_algos_page.html"; + aHelpFileName = "use_existing_algos.html"; return aHelpFileName; } @@ -627,6 +682,7 @@ void SMESHGUI_HypothesisDlg::setCustomFrame( QFrame* f ) void SMESHGUI_HypothesisDlg::accept() { + SUIT_OverrideCursor wc; // some creators temporary set params to a hyp which can be long QString msg; if ( myCreator && !myCreator->checkParams( msg ) ) { @@ -651,7 +707,7 @@ void SMESHGUI_HypothesisDlg::onHelp() if (app) { QString name = "SMESH"; if(myCreator) { - QVariant pluginName = myCreator->property( PLUGIN_NAME ); + QVariant pluginName = myCreator->property( SMESH::Plugin_Name() ); if( pluginName.isValid() ) { QString rootDir = pluginName.toString() + "PLUGIN_ROOT_DIR"; QString varValue = QString( getenv(rootDir.toLatin1().constData())); @@ -686,34 +742,40 @@ void SMESHGUI_HypothesisDlg::setType( const QString& t ) myTypeLabel->setText( t ); } -HypothesisData::HypothesisData( const QString& theTypeName, - const QString& thePluginName, - const QString& theServerLibName, - const QString& theClientLibName, - const QString& theLabel, - const QString& theIconId, - const QList& theDim, - const bool theIsAux, - const QStringList& theNeededHypos, +HypothesisData::HypothesisData( const QString& theTypeName, + const QString& thePluginName, + const QString& theServerLibName, + const QString& theClientLibName, + const QString& theLabel, + const QString& theIconId, + const QString& theContext, + const int theGroupID, + const int thePriority, + const QList& theDim, + const bool theIsAuxOrNeedHyp, + const QStringList& theBasicHypos, const QStringList& theOptionalHypos, const QStringList& theInputTypes, const QStringList& theOutputTypes, - const bool theIsNeedGeometry, - const bool supportSub) + const int theIsNeedGeometry, + const bool theSupportSub) : TypeName( theTypeName ), PluginName( thePluginName ), ServerLibName( theServerLibName ), ClientLibName( theClientLibName ), Label( theLabel ), IconId( theIconId ), + Context( theContext ), + GroupID( theGroupID ), + Priority( thePriority ), Dim( theDim ), - IsAux( theIsAux ), - NeededHypos( theNeededHypos ), + IsAuxOrNeedHyp( theIsAuxOrNeedHyp ), + IsNeedGeometry( theIsNeedGeometry ), + IsSupportSubmeshes( theSupportSub ), + BasicHypos( theBasicHypos ), OptionalHypos( theOptionalHypos ), InputTypes( theInputTypes ), - OutputTypes( theOutputTypes ), - IsNeedGeometry( theIsNeedGeometry ), - IsSupportSubmeshes( supportSub ) + OutputTypes( theOutputTypes ) { }