Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Hypotheses.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index 446a9b67df166118f42a7a7ad3033f082f9c0a82..db3aa0e4813d4535adadc0412775fdb651bc26fb 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-94,7
+94,9
@@
void SMESHGUI_GenericHypothesisCreator::create( SMESH::SMESH_Hypothesis_ptr init
void SMESHGUI_GenericHypothesisCreator::create( bool isAlgo,
const QString& theHypName,
void SMESHGUI_GenericHypothesisCreator::create( bool isAlgo,
const QString& theHypName,
- QWidget* theParent, QObject* obj, const QString& slot )
+ QWidget* theParent,
+ QObject* obj,
+ const QString& slot )
{
myIsCreate = true;
{
myIsCreate = true;
@@
-211,7
+213,7
@@
QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame()
case QVariant::String:
{
if((*anIt).isVariable) {
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 );
QString aVar = (*anIt).myValue.toString();
if(aStudy->IsInteger(aVar.toLatin1().constData())){
SalomeApp_IntSpinBox* sb = new SalomeApp_IntSpinBox( GroupC1 );
@@
-296,7
+298,7
@@
void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
{
//remove just created hypothesis
_PTR(SObject) aHypSObject = SMESH::FindSObject( myHypo );
{
//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();
if( aStudy && !aStudy->GetProperties()->IsLocked() )
{
_PTR(StudyBuilder) aBuilder = aStudy->NewBuilder();
@@
-315,11
+317,9
@@
void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
if( !aSubMesh->_is_nil() )
aMesh = aSubMesh->GetFather();
_PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
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() );
SMESH_Actor* actor = SMESH::FindActorByEntry( meshSO->GetID().c_str() );
- if( actor
) {
+ if( actor
&& actor->GetVisibility() )
actor->Update();
actor->Update();
- }
}
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
}
}
SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
@@
-582,53
+582,53
@@
QString SMESHGUI_GenericHypothesisCreator::helpPage() const
QString aHypType = hypType();
QString aHelpFileName = "";
if ( aHypType == "LocalLength" )
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" )
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")
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")
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")
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")
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")
else if ( aHypType == "MaxElementVolume")
- aHelpFileName = "max_element_volume_hypo
_page
.html";
+ aHelpFileName = "max_element_volume_hypo.html";
else if ( aHypType == "StartEndLength")
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")
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")
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")
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")
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")
else if ( aHypType == "ProjectionSource1D")
- aHelpFileName = "projection_algos
_page
.html";
+ aHelpFileName = "projection_algos.html";
else if ( aHypType == "ProjectionSource2D")
else if ( aHypType == "ProjectionSource2D")
- aHelpFileName = "projection_algos
_page
.html";
+ aHelpFileName = "projection_algos.html";
else if ( aHypType == "ProjectionSource3D")
else if ( aHypType == "ProjectionSource3D")
- aHelpFileName = "projection_algos
_page
.html";
+ aHelpFileName = "projection_algos.html";
else if ( aHypType == "NumberOfLayers")
else if ( aHypType == "NumberOfLayers")
- aHelpFileName = "radial_prism_algo
_page
.html";
+ aHelpFileName = "radial_prism_algo.html";
else if ( aHypType == "NumberOfLayers2D")
else if ( aHypType == "NumberOfLayers2D")
- aHelpFileName = "radial_quadrangle_1D2D_algo
_page
.html";
+ aHelpFileName = "radial_quadrangle_1D2D_algo.html";
else if ( aHypType == "LayerDistribution")
else if ( aHypType == "LayerDistribution")
- aHelpFileName = "radial_prism_algo
_page
.html";
+ aHelpFileName = "radial_prism_algo.html";
else if ( aHypType == "LayerDistribution2D")
else if ( aHypType == "LayerDistribution2D")
- aHelpFileName = "radial_quadrangle_1D2D_algo
_page
.html";
+ aHelpFileName = "radial_quadrangle_1D2D_algo.html";
else if ( aHypType == "SegmentLengthAroundVertex")
else if ( aHypType == "SegmentLengthAroundVertex")
- aHelpFileName = "segments_around_vertex_algo
_page
.html";
+ aHelpFileName = "segments_around_vertex_algo.html";
else if ( aHypType == "QuadrangleParams")
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")
else if ( aHypType == "ViscousLayers")
- aHelpFileName = "additional_hypo
_page.html#viscous_layers_
anchor";
+ aHelpFileName = "additional_hypo
.html#viscous-layers-
anchor";
else if ( aHypType == "ViscousLayers2D")
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")
else if ( aHypType == "ImportSource1D" || aHypType == "ImportSource2D")
- aHelpFileName = "
import_algos_page
.html";
+ aHelpFileName = "
use_existing_algos
.html";
return aHelpFileName;
}
return aHelpFileName;
}