-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
// GEOM GEOMGUI : GUI for Geometry component
// File : OperationGUI_ChamferDlg.cxx
// Author : Damien COQUERET, Open CASCADE S.A.S.
-//
+
#include "OperationGUI_ChamferDlg.h"
#include <SalomeApp_DoubleSpinBox.h>
// Create second group
- myGrp2 = new QGroupBox(tr("GEOM_CHAMFER_EDGES"), centralWidget());
+ myGrp2 = new QGroupBox(tr("GEOM_CHAMFER_EDGE"), centralWidget());
aLayout = new QGridLayout(myGrp2);
aLayout->setMargin(9); aLayout->setSpacing(6);
// Create fourth group
- myGrp4 = new QGroupBox(tr("GEOM_CHAMFER_EDGE"), centralWidget());
+ myGrp4 = new QGroupBox(tr("GEOM_CHAMFER_EDGES"), centralWidget());
aLayout = new QGridLayout(myGrp4);
aLayout->setMargin(9); aLayout->setSpacing(6);
}
// clear selection
- if (aCurrFocus != Faces && aCurrFocus != Edges) {
+ if (aCurrFocus != Face1 && aCurrFocus != Face2 &&
+ aCurrFocus != Faces && aCurrFocus != Edges) {
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
myGeomGUI->getApp()->selectionMgr()->clearSelected();
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
else {
anObj = anOper->MakeChamferEdgeAD(myShape,
mySpinBox[ SpinBox23 ]->value(),
- mySpinBox[ SpinBox24 ]->value() * PI180,
+ mySpinBox[ SpinBox24 ]->value() * M_PI / 180.,
myFace[ Face1 ],
myFace[ Face2 ]);
if (!anObj->_is_nil())
else {
anObj = anOper->MakeChamferFacesAD(myShape,
mySpinBox[ SpinBox33 ]->value(),
- mySpinBox[ SpinBox34 ]->value() * PI180,
+ mySpinBox[ SpinBox34 ]->value() * M_PI / 180.,
anArray);
if (!anObj->_is_nil())
{
else {
anObj = anOper->MakeChamferEdgesAD(myShape,
mySpinBox[ SpinBox43 ]->value(),
- mySpinBox[ SpinBox44 ]->value() * PI180,
+ mySpinBox[ SpinBox44 ]->value() * M_PI / 180.,
anArray);
if (!anObj->_is_nil())
{