-// GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// 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.
+// 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.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// File : OperationGUI_FilletDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
//
-//
-// File : OperationGUI_FilletDlg.cxx
-// Author : Damien COQUERET
-// Module : GEOM
-// $Header$
#include "OperationGUI_FilletDlg.h"
-#include "DlgRef_1Sel1Spin.h"
-#include "DlgRef_2Sel1Spin.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
-#include "OCCViewer_ViewModel.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <OCCViewer_ViewModel.h>
-#include "qlabel.h"
-#include "qpixmap.h"
#include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
-#include <list>
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
//=================================================================================
// class : OperationGUI_FilletDlg()
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-OperationGUI_FilletDlg::OperationGUI_FilletDlg( QWidget* parent )
- :GEOMBase_Skeleton( parent, "OperationGUI_FilletDlg", false,
- WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_FilletDlg::OperationGUI_FilletDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+ : GEOMBase_Skeleton( theGeometryGUI, parent, false )
{
- myConstructorId = -1;
-
- QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_ALL" ) ) );
- QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_EDGE" ) ) );
- QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_FACE" ) ) );
-
- QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+ SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
+ QPixmap image0( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_ALL" ) ) );
+ QPixmap image1( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_EDGE" ) ) );
+ QPixmap image2( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_FACE" ) ) );
- setCaption( tr( "GEOM_FILLET_TITLE" ) );
+ QPixmap iconSelect( aResMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+
+ setWindowTitle( tr( "GEOM_FILLET_TITLE" ) );
/***************************************************************/
- GroupConstructors->setTitle( tr( "GEOM_FILLET" ) );
- RadioButton1->setPixmap( image0 );
- RadioButton2->setPixmap( image1 );
- RadioButton3->setPixmap( image2 );
+ mainFrame()->GroupConstructors->setTitle( tr( "GEOM_FILLET" ) );
+ mainFrame()->RadioButton1->setIcon( image0 );
+ mainFrame()->RadioButton2->setIcon( image1 );
+ mainFrame()->RadioButton3->setIcon( image2 );
- Group1 = new DlgRef_1Sel1Spin( this, "Group1" );
+ Group1 = new DlgRef_1Sel1Spin( centralWidget() );
Group1->GroupBox1->setTitle( tr( "GEOM_FILLET_ALL" ) );
Group1->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
Group1->TextLabel2->setText( tr( "GEOM_RADIUS" ) );
- Group1->PushButton1->setPixmap( iconSelect );
+ Group1->PushButton1->setIcon( iconSelect );
Group1->LineEdit1->setReadOnly( true );
- Group2 = new DlgRef_2Sel1Spin( this, "Group2" );
+ Group2 = new DlgRef_2Sel3Spin2Rb( centralWidget() );
Group2->GroupBox1->setTitle( tr( "GEOM_FILLET_EDGES" ) );
Group2->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
Group2->TextLabel2->setText( tr( "SELECTED_EDGES" ) );
Group2->TextLabel3->setText( tr( "GEOM_RADIUS" ) );
- Group2->PushButton1->setPixmap( iconSelect );
- Group2->PushButton2->setPixmap( iconSelect );
+ Group2->TextLabel4->setText( tr( "GEOM_R1" ) );
+ Group2->TextLabel5->setText( tr( "GEOM_R2" ) );
+ Group2->PushButton1->setIcon( iconSelect );
+ Group2->PushButton2->setIcon( iconSelect );
Group2->LineEdit1->setReadOnly( true );
Group2->LineEdit2->setReadOnly( true );
- Group3 = new DlgRef_2Sel1Spin( this, "Group3" );
- Group3->GroupBox1->setTitle(tr( "GEOM_FILLET_FACES" ) );
- Group3->TextLabel1->setText(tr( "GEOM_MAIN_OBJECT" ) );
- Group3->TextLabel2->setText(tr( "SELECTED_FACES" ) );
- Group3->TextLabel3->setText(tr( "GEOM_RADIUS" ) );
- Group3->PushButton1->setPixmap( iconSelect );
- Group3->PushButton2->setPixmap( iconSelect );
+ Group3 = new DlgRef_2Sel3Spin2Rb( centralWidget() );
+ Group3->GroupBox1->setTitle( tr( "GEOM_FILLET_FACES" ) );
+ Group3->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
+ Group3->TextLabel2->setText( tr( "SELECTED_FACES" ) );
+ Group3->TextLabel3->setText( tr( "GEOM_RADIUS" ) );
+ Group3->TextLabel4->setText( tr( "GEOM_R1" ) );
+ Group3->TextLabel5->setText( tr( "GEOM_R2" ) );
+ Group3->PushButton1->setIcon( iconSelect );
+ Group3->PushButton2->setIcon( iconSelect );
Group3->LineEdit1->setReadOnly( true );
Group3->LineEdit2->setReadOnly( true );
- Layout1->addWidget( Group1, 2, 0 );
- Layout1->addWidget( Group2, 2, 0 );
- Layout1->addWidget( Group3, 2, 0 );
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( Group1 );
+ layout->addWidget( Group2 );
+ layout->addWidget( Group3 );
/***************************************************************/
double SpecificStep = 10.0;
- Group1->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, SpecificStep, 3);
- Group2->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, SpecificStep, 3);
- Group3->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, SpecificStep, 3);
+ initSpinBox( Group1->SpinBox_DX, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( Group2->SpinBox_DX, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( Group2->SpinBox_DY, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( Group2->SpinBox_DZ, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( Group3->SpinBox_DX, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( Group3->SpinBox_DY, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( Group3->SpinBox_DZ, 0.001, COORD_MAX, SpecificStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+ setHelpFileName( "fillet_operation_page.html" );
/* Initialisations */
Init();
{
myConstructorId = -1;
reset();
- RadioButton1->setChecked( true );
- myEditCurrentArgument = Group1->LineEdit1;
// main buttons
- connect( buttonOk , SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
- connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+ connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+ connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
// group box
- connect( GroupConstructors, SIGNAL( clicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+ connect( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
// push buttons
- connect(Group1->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(Group2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(Group3->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(Group2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(Group3->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+ connect( Group1->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( Group2->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( Group3->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( Group2->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( Group3->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
// line edits
- connect(Group1->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(Group2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(Group3->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect( Group1->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+ connect( Group2->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+ connect( Group3->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
// spin boxes
- connect(Group1->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(Group2->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(Group3->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-
- // selection
- connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+ connect( Group1->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( Group2->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( Group2->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( Group2->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( Group3->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( Group3->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( Group3->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+ // radio buttons
+ connect( Group2->RadioButton1, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+ connect( Group2->RadioButton2, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+ connect( Group3->RadioButton1, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+ connect( Group3->RadioButton2, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+
+ // selection
+ connect( myGeomGUI->getApp()->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
-
initName( tr( "GEOM_FILLET" ) );
- Group2->hide();
- Group3->hide();
- Group1->show();
-
- this->show();
+ ConstructorsClicked( 0 );
}
void OperationGUI_FilletDlg::ConstructorsClicked( int constructorId )
{
if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType()
- != OCCViewer_Viewer::Type() )
- {
- RadioButton1->setChecked( true );
+ != OCCViewer_Viewer::Type() ) {
+ mainFrame()->RadioButton1->setChecked( true );
return;
}
return;
// Get radius from previous widget
- double R = 5;
- if ( myConstructorId == 0 ) R = Group1->SpinBox_DX->GetValue();
- else if ( myConstructorId == 1 ) R = Group2->SpinBox_DX->GetValue();
- else R = Group3->SpinBox_DX->GetValue();
+ double R = 5, R1 = 5, R2 = 5;
+ if ( myConstructorId == 0 ) {
+ R = Group1->SpinBox_DX->value();
+ }
+ else if ( myConstructorId == 1 ) {
+ R = Group2->SpinBox_DX->value();
+ R1 = Group2->SpinBox_DY->value();
+ R2 = Group2->SpinBox_DZ->value();
+ }
+ else {
+ R = Group3->SpinBox_DX->value();
+ R1 = Group3->SpinBox_DY->value();
+ R2 = Group3->SpinBox_DZ->value();
+ }
myConstructorId = constructorId;
- switch ( constructorId )
- {
- case 0:
- Group1->show();
- Group2->hide();
- Group3->hide();
- Group1->SpinBox_DX->SetValue( R );
+ switch ( constructorId ) {
+ case 0:
+ Group2->hide();
+ Group3->hide();
+ Group1->show();
+ Group1->SpinBox_DX->setValue( R );
break;
- case 1:
- Group1->hide();
- Group2->show();
- Group3->hide();
- Group2->SpinBox_DX->SetValue( R );
+ case 1:
+ Group1->hide();
+ Group3->hide();
+ Group2->show();
+ Group2->SpinBox_DX->setValue( R );
+ Group2->SpinBox_DY->setValue( R1 );
+ Group2->SpinBox_DZ->setValue( R2 );
break;
- case 2:
- Group1->hide();
- Group2->hide();
- Group3->show();
- Group3->SpinBox_DX->SetValue( R );
+ case 2:
+ Group1->hide();
+ Group2->hide();
+ Group3->show();
+ Group3->SpinBox_DX->setValue( R );
+ Group3->SpinBox_DY->setValue( R1 );
+ Group3->SpinBox_DZ->setValue( R2 );
break;
- default:
+ default:
break;
}
activateSelection();
enableWidgets();
- if ( !myShape->_is_nil() )
- {
+ if ( !myShape->_is_nil() ) {
myEditCurrentArgument->setText( GEOMBase::GetName( myShape ) );
GEOMBase_Skeleton::LineEditReturnPressed();
}
else
myEditCurrentArgument->setText( "" );
+ qApp->processEvents();
+ updateGeometry();
+ resize( minimumSize() );
+
displayPreview();
}
//=================================================================================
bool OperationGUI_FilletDlg::ClickOnApply()
{
- if ( !onAccept() )
+ if ( !onAccept() )
return false;
initName();
erasePreview();
myEditCurrentArgument->setText( "" );
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
// If selection of main object is activated
- if ( myEditCurrentArgument == Group1->LineEdit1 ||
- myEditCurrentArgument == Group2->LineEdit1 ||
- myEditCurrentArgument == Group3->LineEdit1 )
+ if (myEditCurrentArgument == Group1->LineEdit1 ||
+ myEditCurrentArgument == Group2->LineEdit1 ||
+ myEditCurrentArgument == Group3->LineEdit1)
{
- if ( IObjectCount() == 1 )
- {
+ if (aSelList.Extent() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
- GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+ GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
- if ( aResult && !anObj->_is_nil() )
- {
+ if (aResult && !anObj->_is_nil()) {
myShape = anObj;
- myEditCurrentArgument->setText( GEOMBase::GetName( anObj ) );
+ myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
displayPreview();
enableWidgets();
return;
enableWidgets();
}
// If face or edge selection is activated
- else if ( myEditCurrentArgument == Group2->LineEdit2 ||
- myEditCurrentArgument == Group3->LineEdit2 )
+ else if (myEditCurrentArgument == Group2->LineEdit2 ||
+ myEditCurrentArgument == Group3->LineEdit2)
{
- if ( IObjectCount() == 1 )
- {
+ if (aSelList.Extent() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
- GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
-
- if ( aResult && !anObj->_is_nil() )
- {
- TColStd_IndexedMapOfInteger anIndexes;
- ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( firstIObject(), anIndexes );
-
- if ( anIndexes.Extent() > 0 )
- {
- QString aName;
- if ( anIndexes.Extent() == 1 )
- {
- int anIndex = anIndexes( 1 );
-
- aName = QString( GEOMBase::GetName( anObj ) ) + QString( ":%1" ).arg( anIndex );
- }
- else
- aName = tr( "GEOM_MEN_POPUP_NAME" ).arg( anIndexes.Extent() );
-
- myEditCurrentArgument->setText( aName );
-
- if ( myConstructorId == 1 )
- myEdges = anIndexes;
- else
- myFaces = anIndexes;
-
- displayPreview();
- return;
- }
+ GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+
+ if (aResult && !anObj->_is_nil()) {
+ TColStd_IndexedMapOfInteger anIndexes;
+ aSelMgr->GetIndexes(aSelList.First(), anIndexes);
+
+ if (anIndexes.Extent() > 0) {
+ QString aName;
+ if (anIndexes.Extent() == 1) {
+ int anIndex = anIndexes(1);
+
+ aName = QString( GEOMBase::GetName( anObj ) ) + QString( ":%1" ).arg( anIndex );
+ }
+ else
+ aName = tr( "GEOM_MEN_POPUP_NAME" ).arg( anIndexes.Extent() );
+
+ myEditCurrentArgument->setText( aName );
+
+ if ( myConstructorId == 1 )
+ myEdges = anIndexes;
+ else
+ myFaces = anIndexes;
+
+ displayPreview();
+ return;
+ }
}
}
myFaces.Clear();
}
}
-
//=================================================================================
// function : LineEditReturnPressed()
// purpose :
return;
GEOMBase_Skeleton::LineEditReturnPressed();
- return;
}
{
QPushButton* send = (QPushButton*)sender();
- if ( send == Group1->PushButton1 )
- {
+ if ( send == Group1->PushButton1 ) {
Group1->LineEdit1->setFocus();
myEditCurrentArgument = Group1->LineEdit1;
}
- else if( send == Group2->PushButton1 )
- {
+ else if ( send == Group2->PushButton1 ) {
Group2->LineEdit1->setFocus();
myEditCurrentArgument = Group2->LineEdit1;
}
- else if( send == Group2->PushButton2 )
- {
+ else if ( send == Group2->PushButton2 ) {
Group2->LineEdit2->setFocus();
myEditCurrentArgument = Group2->LineEdit2;
}
- else if ( send == Group3->PushButton1 )
- {
+ else if ( send == Group3->PushButton1 ) {
Group3->LineEdit1->setFocus();
myEditCurrentArgument = Group3->LineEdit1;
}
- else if( send == Group3->PushButton2 )
- {
+ else if ( send == Group3->PushButton2 ) {
Group3->LineEdit1->setFocus();
myEditCurrentArgument = Group3->LineEdit2;
}
}
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose :
-//=================================================================================
-void OperationGUI_FilletDlg::DeactivateActiveDialog()
-{
- GEOMBase_Skeleton::DeactivateActiveDialog();
- return;
-}
-
-
//=================================================================================
// function : ActivateThisDialog()
// purpose :
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT( SelectionIntoArgument() ) );
+ connect( myGeomGUI->getApp()->selectionMgr(),
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
activateSelection();
displayPreview();
// function : enterEvent()
// purpose :
//=================================================================================
-void OperationGUI_FilletDlg::enterEvent( QEvent* e )
+void OperationGUI_FilletDlg::enterEvent( QEvent* )
{
- if ( !GroupConstructors->isEnabled() )
+ if ( !mainFrame()->GroupConstructors->isEnabled() )
this->ActivateThisDialog();
}
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void OperationGUI_FilletDlg::ValueChangedInSpinBox( double newValue )
+void OperationGUI_FilletDlg::ValueChangedInSpinBox( double )
{
displayPreview();
}
void OperationGUI_FilletDlg::reset()
{
// Set Initial values of spinboxes
- Group1->SpinBox_DX->SetValue( 5 );
- Group2->SpinBox_DX->SetValue( 5 );
- Group3->SpinBox_DX->SetValue( 5 );
+ Group1->SpinBox_DX->setValue( 5 );
+ Group2->SpinBox_DX->setValue( 5 );
+ Group2->SpinBox_DY->setValue( 5 );
+ Group2->SpinBox_DZ->setValue( 5 );
+ Group3->SpinBox_DX->setValue( 5 );
+ Group3->SpinBox_DY->setValue( 5 );
+ Group3->SpinBox_DZ->setValue( 5 );
Group1->LineEdit1->setText( "" );
Group2->LineEdit1->setText( "" );
enableWidgets();
}
-//=================================================================================
-// function : getConstructorId()
-// purpose :
-//=================================================================================
-int OperationGUI_FilletDlg::getConstructorId() const
-{
- return GroupConstructors->id( GroupConstructors->selected() );
-}
-
//=================================================================================
// function : activateSelection
// purpose : Activate selection in accordance with myEditCurrentArgument
localSelection( myShape, TopAbs_EDGE );
else if ( !myShape->_is_nil() && myEditCurrentArgument == Group3->LineEdit2 )
localSelection( myShape, TopAbs_FACE );
- else
- {
+ else {
TColStd_MapOfInteger aMap;
aMap.Add( GEOM_SHELL );
aMap.Add( GEOM_SOLID );
bool toEnable = !myShape->_is_nil();
- if ( anId == 1 )
- {
+ if ( anId == 1 ) {
Group2->LineEdit2->setEnabled( toEnable );
Group2->PushButton2->setEnabled( toEnable );
- if ( !toEnable )
- {
+ if ( !toEnable ) {
Group2->LineEdit2->setText( "" );
myEdges.Clear();
}
}
- else if ( anId == 2 )
- {
+ else if ( anId == 2 ) {
Group3->LineEdit2->setEnabled( toEnable );
Group3->PushButton2->setEnabled( toEnable );
- if ( !toEnable )
- {
+ if ( !toEnable ) {
Group3->LineEdit2->setText( "" );
myFaces.Clear();
}
int anId = getConstructorId();
if ( anId == 0 )
anObj = GEOM::GEOM_ILocalOperations::_narrow(
- getOperation() )->MakeFilletAll( myShape,
- getRadius() );
- else if ( anId == 1 )
- {
+ getOperation() )->MakeFilletAll( myShape, getRadius() );
+ else if ( anId == 1 ) {
GEOM::ListOfLong_var aList = new GEOM::ListOfLong;
aList->length( myEdges.Extent() );
for ( int i = 1, n = myEdges.Extent(); i <= n; i++ )
aList[ i - 1 ] = myEdges( i );
- anObj = GEOM::GEOM_ILocalOperations::_narrow(
- getOperation() )->MakeFilletEdges( myShape, getRadius(), aList );
+ if ( Group2->RadioButton1->isChecked() )
+ anObj = GEOM::GEOM_ILocalOperations::_narrow( getOperation() )->
+ MakeFilletEdges( myShape, getRadius(), aList );
+ else
+ anObj = GEOM::GEOM_ILocalOperations::_narrow( getOperation() )->
+ MakeFilletEdgesR1R2( myShape,
+ Group2->SpinBox_DY->value(),
+ Group2->SpinBox_DZ->value(),
+ aList );
}
- else if ( anId == 2 )
- {
- int i = 0;
+ else if ( anId == 2 ) {
GEOM::ListOfLong_var aList = new GEOM::ListOfLong;
aList->length( myFaces.Extent() );
for ( int i = 1, n = myFaces.Extent(); i <= n; i++ )
aList[ i - 1 ] = myFaces( i );
- anObj = GEOM::GEOM_ILocalOperations::_narrow(
- getOperation() )->MakeFilletFaces( myShape, getRadius(), aList );
+ if ( Group3->RadioButton1->isChecked() ) {
+ anObj = GEOM::GEOM_ILocalOperations::_narrow( getOperation() )->
+ MakeFilletFaces( myShape, getRadius(), aList );
+ }
+ else {
+ anObj = GEOM::GEOM_ILocalOperations::_narrow( getOperation() )->
+ MakeFilletFacesR1R2( myShape,
+ Group3->SpinBox_DY->value(),
+ Group3->SpinBox_DZ->value(), aList );
+ }
}
if ( !anObj->_is_nil() )
double OperationGUI_FilletDlg::getRadius() const
{
int anId = getConstructorId();
- if ( anId == 0 ) return Group1->SpinBox_DX->GetValue();
- else if ( anId == 1 ) return Group2->SpinBox_DX->GetValue();
- else return Group3->SpinBox_DX->GetValue();
+ if ( anId == 0 ) return Group1->SpinBox_DX->value();
+ else if ( anId == 1 ) return Group2->SpinBox_DX->value();
+ else return Group3->SpinBox_DX->value();
}
+//=================================================================================
+// function : RadiobuttonClicked
+// purpose :
+//=================================================================================
+void OperationGUI_FilletDlg::RadioButtonClicked()
+{
+ const QObject* s = sender();
+ bool flag = s == Group2->RadioButton1 || s == Group3->RadioButton1;
+
+ Group2->RadioButton1->blockSignals( true );
+ Group2->RadioButton2->blockSignals( true );
+ Group3->RadioButton1->blockSignals( true );
+ Group3->RadioButton2->blockSignals( true );
+
+ Group2->SpinBox_DX->setEnabled( flag );
+ Group2->SpinBox_DY->setEnabled( !flag );
+ Group2->SpinBox_DZ->setEnabled( !flag );
+ Group2->RadioButton1->setChecked( flag );
+ Group2->RadioButton2->setChecked( !flag );
+ Group3->SpinBox_DX->setEnabled( flag );
+ Group3->SpinBox_DY->setEnabled( !flag );
+ Group3->SpinBox_DZ->setEnabled( !flag );
+ Group3->RadioButton1->setChecked( flag );
+ Group3->RadioButton2->setChecked( !flag );
+
+ Group2->RadioButton1->blockSignals( false );
+ Group2->RadioButton2->blockSignals( false );
+ Group3->RadioButton1->blockSignals( false );
+ Group3->RadioButton2->blockSignals( false );
-
-
-
+ displayPreview();
+}
