-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2010 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
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// GEOM GEOMGUI : GUI for Geometry component
// File : GenerationGUI_FillingDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
// TRUE to construct a modal dialog.
//=================================================================================
GenerationGUI_FillingDlg::GenerationGUI_FillingDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
- bool modal, Qt::WindowFlags fl )
+ bool modal, Qt::WindowFlags fl )
: GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
{
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLING" ) ) );
GroupPoints->TextLabel5->setText( tr( "GEOM_FILLING_MAX_DEG" ) );
GroupPoints->TextLabel6->setText( tr( "GEOM_FILLING_TOL_3D" ) );
GroupPoints->CheckBox1->setText( tr( "GEOM_FILLING_APPROX" ) );
+ GroupPoints->TextLabel7->setText( tr( "GEOM_FILLING_METHOD" ) );
GroupPoints->PushButton1->setIcon( image1 );
GroupPoints->LineEdit1->setReadOnly( true );
myEditCurrentArgument = GroupPoints->LineEdit1;
GroupPoints->LineEdit1->setReadOnly( true );
- myMinDeg = 2;
- myMaxDeg = 5;
- myTol3D = 0.0001;
- myTol2D = 0.0001;
- myNbIter = 0;
- myIsApprox = false;
- myOkCompound = false;
-
globalSelection( GEOM_COMPOUND );
- double SpecificStep1 = 1;
+ int SpecificStep1 = 1;
double SpecificStep2 = 0.0001;
/* min, max, step and decimals for spin boxes & initial values */
- initSpinBox( GroupPoints->SpinBox1, 2.0, MAX_NUMBER, SpecificStep1, 3 );
- initSpinBox( GroupPoints->SpinBox2, 0.00001, 10000.0, SpecificStep2, 5 );
- initSpinBox( GroupPoints->SpinBox3, 0.0, MAX_NUMBER, SpecificStep1, 3 );
- initSpinBox( GroupPoints->SpinBox4, 1.0, MAX_NUMBER, SpecificStep1, 3 );
- initSpinBox( GroupPoints->SpinBox5, 0.00001, 10000.0, SpecificStep2, 5 );
-
- GroupPoints->SpinBox1->setValue( myMinDeg );
- GroupPoints->SpinBox2->setValue( myTol2D );
- GroupPoints->SpinBox3->setValue( myNbIter );
- GroupPoints->SpinBox4->setValue( myMaxDeg );
- GroupPoints->SpinBox5->setValue( myTol3D );
+ initSpinBox( GroupPoints->SpinBox1, 2, MAX_NUMBER, SpecificStep1 );
+ initSpinBox( GroupPoints->SpinBox2, 0.00001, 10000.0, SpecificStep2, "len_tol_precision" );
+ initSpinBox( GroupPoints->SpinBox3, 0, MAX_NUMBER, SpecificStep1 );
+ initSpinBox( GroupPoints->SpinBox4, 1, MAX_NUMBER, SpecificStep1 );
+ initSpinBox( GroupPoints->SpinBox5, 0.00001, 10000.0, SpecificStep2, "len_tol_precision" );
+
+ GroupPoints->SpinBox1->setValue( 2 );
+ GroupPoints->SpinBox2->setValue( 0.0001 );
+ GroupPoints->SpinBox3->setValue( 0 );
+ GroupPoints->SpinBox4->setValue( 5 );
+ GroupPoints->SpinBox5->setValue( 0.0001 );
+
+ GroupPoints->ComboBox1->addItem(tr("GEOM_FILLING_DEFAULT"));
+ GroupPoints->ComboBox1->addItem(tr("GEOM_FILLING_USEORI"));
+ GroupPoints->ComboBox1->addItem(tr("GEOM_FILLING_AUTO"));
/* signals and slots connections */
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
- connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+ connect( GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(MethodChanged()));
connect( GroupPoints->SpinBox1, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( GroupPoints->SpinBox2, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( GroupPoints->SpinBox4, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( GroupPoints->SpinBox5, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
- connect( GroupPoints->CheckBox1, SIGNAL( stateChanged( int ) ), this, SLOT( ApproxChanged() ) );
+ connect( GroupPoints->CheckBox1, SIGNAL( stateChanged( int ) ),
+ this, SLOT( ApproxChanged() ) );
- connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
+ // san: Commented, as all spin boxes here either are integer or use specific non-default step value
+ //connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
- SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_FILLING" ) );
resize(100,100);
//=================================================================================
void GenerationGUI_FillingDlg::SetDoubleSpinBoxStep( double step )
{
- GroupPoints->SpinBox1->setSingleStep(step);
GroupPoints->SpinBox2->setSingleStep(step);
- GroupPoints->SpinBox3->setSingleStep(step);
- GroupPoints->SpinBox4->setSingleStep(step);
GroupPoints->SpinBox5->setSingleStep(step);
}
erasePreview();
myEditCurrentArgument->setText("");
- LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
- SALOME_ListIO aSelList;
- aSelMgr->selectedObjects(aSelList);
-
- if (aSelList.Extent() != 1) {
- if (myEditCurrentArgument == GroupPoints->LineEdit1)
- myOkCompound = false;
- return;
- }
-
- // nbSel == 1
- Standard_Boolean testResult = Standard_False;
- GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
-
- if (!testResult)
- return;
-
if (myEditCurrentArgument == GroupPoints->LineEdit1) {
- TopoDS_Shape S;
- myOkCompound = false;
-
- if (GEOMBase::GetShape(aSelectedObject, S) && S.ShapeType() == TopAbs_COMPOUND) {
- // myCompound should be a compound of edges
- for (TopoDS_Iterator it (S); it.More(); it.Next())
- if (it.Value().ShapeType() != TopAbs_EDGE)
- return;
- myCompound = aSelectedObject;
- myOkCompound = true;
+ myCompound = getSelected( TopAbs_COMPOUND );
+ if ( myCompound ) {
+ if ( myCompound->GetMaxShapeType() < GEOM::WIRE || myCompound->GetMinShapeType() > GEOM::EDGE ) {
+ myCompound.nullify();
+ }
+ else {
+ QString aName = GEOMBase::GetName( myCompound.get() );
+ myEditCurrentArgument->setText( aName );
+ }
}
}
- myEditCurrentArgument->setText(GEOMBase::GetName(aSelectedObject));
displayPreview();
}
}
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose :
-//=================================================================================
-void GenerationGUI_FillingDlg::LineEditReturnPressed()
-{
- QLineEdit* send = (QLineEdit*)sender();
- if ( send == GroupPoints->LineEdit1 ) {
- myEditCurrentArgument = send;
- GEOMBase_Skeleton::LineEditReturnPressed();
- }
-}
-
-
//=================================================================================
// function : ActivateThisDialog()
// purpose :
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
- SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
globalSelection( GEOM_COMPOUND );
displayPreview();
}
//=================================================================================
void GenerationGUI_FillingDlg::ValueChangedInSpinBox( double newValue )
{
- QObject* send = (QObject*)sender();
-
- if ( send == GroupPoints->SpinBox1 )
- myMinDeg = int( newValue );
- else if ( send == GroupPoints->SpinBox2 )
- myTol2D = newValue;
- else if ( send == GroupPoints->SpinBox3 )
- myNbIter = int(newValue);
- else if ( send == GroupPoints->SpinBox4 )
- myMaxDeg = int(newValue);
- else if ( send == GroupPoints->SpinBox5 )
- myTol3D = newValue;
+ displayPreview();
+}
+//=================================================================================
+// function : MethodChanged
+// purpose :
+//=================================================================================
+void GenerationGUI_FillingDlg::MethodChanged()
+{
displayPreview();
}
//=================================================================================
void GenerationGUI_FillingDlg::ApproxChanged()
{
- myIsApprox = GroupPoints->CheckBox1->isChecked();
displayPreview();
}
+
//=================================================================================
// function : createOperation
// purpose :
//=================================================================================
bool GenerationGUI_FillingDlg::isValid( QString& msg )
{
- bool ok = true;
- ok = GroupPoints->SpinBox1->isValid( msg, !IsPreview() ) && ok;
- ok = GroupPoints->SpinBox2->isValid( msg, !IsPreview() ) && ok;
- ok = GroupPoints->SpinBox3->isValid( msg, !IsPreview() ) && ok;
- ok = GroupPoints->SpinBox4->isValid( msg, !IsPreview() ) && ok;
- ok = GroupPoints->SpinBox5->isValid( msg, !IsPreview() ) && ok;
-
- return myOkCompound > 0 && ok;
+ bool ok = GroupPoints->SpinBox1->isValid( msg, !IsPreview() ) &&
+ GroupPoints->SpinBox2->isValid( msg, !IsPreview() ) &&
+ GroupPoints->SpinBox3->isValid( msg, !IsPreview() ) &&
+ GroupPoints->SpinBox4->isValid( msg, !IsPreview() ) &&
+ GroupPoints->SpinBox5->isValid( msg, !IsPreview() ) &&
+ myCompound;
+ return ok;
}
//=================================================================================
//=================================================================================
bool GenerationGUI_FillingDlg::execute( ObjectList& objects )
{
- GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation());
- GEOM::GEOM_Object_var anObj = anOper->MakeFilling( myCompound, myMinDeg, myMaxDeg,
- myTol2D, myTol3D, myNbIter, myIsApprox );
+ GEOM::GEOM_I3DPrimOperations_var anOper =
+ GEOM::GEOM_I3DPrimOperations::_narrow(getOperation());
+
+ GEOM::filling_oper_method aMethod;
+ switch (GroupPoints->ComboBox1->currentIndex())
+ {
+ case 0: aMethod = GEOM::FOM_Default; break;
+ case 1: aMethod = GEOM::FOM_UseOri; break;
+ case 2: aMethod = GEOM::FOM_AutoCorrect; break;
+ default: break;
+ }
+
+ GEOM::GEOM_Object_var anObj =
+ anOper->MakeFilling( myCompound.get(),
+ GroupPoints->SpinBox1->value(),
+ GroupPoints->SpinBox4->value(),
+ GroupPoints->SpinBox2->value(),
+ GroupPoints->SpinBox5->value(),
+ GroupPoints->SpinBox3->value(),
+ aMethod,
+ GroupPoints->CheckBox1->isChecked() );
if ( !anObj->_is_nil() )
{
if ( !IsPreview() )
