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
Merge from V5_1_main 14/05/2010
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SmoothingDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
index 1cab8d3f47eadf428db66ab14cf8efdbdde1370f..3b83752eb5c1527da99d5cd4aa3784380eb804ad 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// 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_SmoothingDlg.cxx
// Author : Michael ZORIN, Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_SmoothingDlg.cxx
// Author : Michael ZORIN, Open CASCADE S.A.S.
@@
-229,7
+230,7
@@
SMESHGUI_SmoothingDlg::SMESHGUI_SmoothingDlg( SMESHGUI* theModule )
SpinBox_IterationLimit->setRange(1, 999999);
SpinBox_IterationLimit->setValue(20);
SpinBox_IterationLimit->setRange(1, 999999);
SpinBox_IterationLimit->setValue(20);
- SpinBox_AspectRatio->RangeStepAndValidator(0.0, +999999.999, 0.1,
3
);
+ SpinBox_AspectRatio->RangeStepAndValidator(0.0, +999999.999, 0.1,
"parametric_precision"
);
SpinBox_AspectRatio->SetValue(1.1);
GroupArguments->show();
SpinBox_AspectRatio->SetValue(1.1);
GroupArguments->show();
@@
-386,11
+387,13
@@
bool SMESHGUI_SmoothingDlg::ClickOnApply()
}
if (aResult) {
}
if (aResult) {
- Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
+ if ( myActor ) {
+ Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
+ SALOME_ListIO aList;
+ aList.Append(anIO);
+ mySelectionMgr->setSelectedObjects(aList, false);
+ }
- SALOME_ListIO aList;
- aList.Append(anIO);
- mySelectionMgr->setSelectedObjects(aList, false);
SMESH::UpdateView();
Init();
SMESH::UpdateView();
Init();
@@
-564,7
+567,7
@@
void SMESHGUI_SmoothingDlg::SelectionIntoArgument()
return;
myActor = SMESH::FindActorByObject(myMesh);
return;
myActor = SMESH::FindActorByObject(myMesh);
- if (!myActor)
+ if (!myActor
&& !CheckBoxMesh->isChecked()
)
return;
int aNbUnits = 0;
return;
int aNbUnits = 0;