-// Copyright (C) 2007-2015 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
#include "SMESHGUI_HypothesesUtils.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_SpinBox.h"
+#include "SMESHGUI_VTKUtils.h"
+#include "SMESH_Actor.h"
// SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_IntSpinBox.h>
+#include <SalomeApp_Tools.h>
+#include <SVTK_ViewWindow.h>
// Qt includes
#include <QFrame>
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,
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
}
}
break;
- }
+
+ default:;
+ } // switch( (*anIt).myValue.type() )
if( w )
{
bool res = result==QDialog::Accepted;
if( res )
{
- SUIT_OverrideCursor wc;
- /*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();
{
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<SMESH::SMESH_Mesh>( submSO );
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 );
myDlg->close();
//delete myDlg; since WA_DeleteOnClose==true
myDlg = 0;
+ if (SVTK_ViewWindow* vf = SMESH::GetCurrentVtkView()) {
+ vf->Repaint();
+ }
emit finished( result );
}
{
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 += "; ";
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 = "a1d_meshing_hypo_page.html#geometric_1d_anchor";
+ 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 = "a1d_meshing_hypo_page.html#adaptive_1d_anchor";
+ 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_page.html#viscous_layers_anchor";
+ 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;
}
myTypeLabel->setText( t );
}
-HypothesisData::HypothesisData( const QString& theTypeName,
- const QString& thePluginName,
- const QString& theServerLibName,
- const QString& theClientLibName,
- const QString& theLabel,
- const QString& theIconId,
- const QString& theContext,
- const QList<int>& theDim,
- const bool theIsAuxOrNeedHyp,
+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<int>& 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 ),
Label( theLabel ),
IconId( theIconId ),
Context( theContext ),
+ GroupID( theGroupID ),
+ Priority( thePriority ),
Dim( theDim ),
IsAuxOrNeedHyp( theIsAuxOrNeedHyp ),
+ IsNeedGeometry( theIsNeedGeometry ),
+ IsSupportSubmeshes( theSupportSub ),
BasicHypos( theBasicHypos ),
OptionalHypos( theOptionalHypos ),
InputTypes( theInputTypes ),
- OutputTypes( theOutputTypes ),
- IsNeedGeometry( theIsNeedGeometry ),
- IsSupportSubmeshes( supportSub )
+ OutputTypes( theOutputTypes )
{
}