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
23061: [CEA 1488] Import 1D-2D fails sometimes in relation with the source face discr...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_AddMeshElementDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 87c9b0ba785aa9bebc9a9b641a4087a13880bcf3..35bc44b9b1d4c1fd02c4b5251c1d6c837f558693 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-169,7
+169,8
@@
namespace SMESH
// Preview for the balls
vtkProperty* aBallProp = vtkProperty::New();
aBallProp->SetColor(ffc.red() / 255. , ffc.green() / 255. , ffc.blue() / 255.);
// Preview for the balls
vtkProperty* aBallProp = vtkProperty::New();
aBallProp->SetColor(ffc.red() / 255. , ffc.green() / 255. , ffc.blue() / 255.);
- double aBallElemSize = SMESH::GetFloat("SMESH:ball_elem_size",10);
+ //double aBallElemSize = SMESH::GetFloat("SMESH:ball_elem_size",10);
+ double aBallElemSize = SMESH::GetFloat("SMESH:ball_elem_diameter",1);
aBallProp->SetPointSize(aBallElemSize);
myBallPolyData = vtkPolyData::New();
aBallProp->SetPointSize(aBallElemSize);
myBallPolyData = vtkPolyData::New();
@@
-230,7
+231,7
@@
namespace SMESH
for (int i = 0, iEnd = theIds.size(); i < iEnd; i++){
anIds->InsertId(0,theIds[i]);
vtkIdType anId = myBallPolyData->InsertNextCell(VTK_POLY_VERTEX,anIds);
for (int i = 0, iEnd = theIds.size(); i < iEnd; i++){
anIds->InsertId(0,theIds[i]);
vtkIdType anId = myBallPolyData->InsertNextCell(VTK_POLY_VERTEX,anIds);
- double d = theDiameter;
+ double d = theDiameter
* theActor->GetBallScale()
;
aScalars->SetTuple(anId,&d);
anIds->Reset();
}
aScalars->SetTuple(anId,&d);
anIds->Reset();
}
@@
-427,7
+428,7
@@
SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theMo
GroupC1Layout->addWidget(DiameterSpinBox, 1, 1, 1, 2);
DiameterSpinBox->RangeStepAndValidator( 1e-7, 1e+9, 0.1 );
GroupC1Layout->addWidget(DiameterSpinBox, 1, 1, 1, 2);
DiameterSpinBox->RangeStepAndValidator( 1e-7, 1e+9, 0.1 );
- DiameterSpinBox->SetValue(
1.
);
+ DiameterSpinBox->SetValue(
SMESH::GetFloat("SMESH:ball_elem_diameter", 1)
);
connect( DiameterSpinBox, SIGNAL( valueChanged ( double ) ), this, SLOT( onDiameterChanged( ) ) );
}
/* Add to group ************************************************/
connect( DiameterSpinBox, SIGNAL( valueChanged ( double ) ), this, SLOT( onDiameterChanged( ) ) );
}
/* Add to group ************************************************/
@@
-586,6
+587,7
@@
void SMESHGUI_AddMeshElementDlg::ClickOnApply()
SMESH::long_array_var anIdList = new SMESH::long_array;
anIdList->length( 1 );
anIdList[0] = -1;
SMESH::long_array_var anIdList = new SMESH::long_array;
anIdList->length( 1 );
anIdList[0] = -1;
+ const bool onlyNodesInMesh = ( myMesh->NbElements() == 0 );
switch (myElementType) {
case SMDSAbs_0DElement:
switch (myElementType) {
case SMDSAbs_0DElement:
@@
-645,8
+647,10
@@
void SMESHGUI_AddMeshElementDlg::ClickOnApply()
mySelectionMgr->setSelectedObjects( aList, false );
mySimulation->SetVisibility(false);
mySelectionMgr->setSelectedObjects( aList, false );
mySimulation->SetVisibility(false);
+ if ( onlyNodesInMesh )
+ myActor->SetRepresentation( SMESH_Actor::eEdge ); // wireframe
SMESH::UpdateView();
SMESH::UpdateView();
-
+
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);