// 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
//
//
//
#include "GenerationGUI_PrismDlg.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+
#include <BRepPrimAPI_MakePrism.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <gp_Lin.hxx>
-#include "QAD_Config.h"
-#include "QAD_Desktop.h"
#include "GEOMImpl_Types.hxx"
+#include <qlabel.h>
#include <qcheckbox.h>
#include "utilities.h"
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
- :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
+ const char* name, bool modal, WFlags fl)
+ :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
+ WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_PRISM")));
- QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PRISM")));
+ QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PRISM_2P")));
setCaption(tr("GEOM_PRISM_TITLE"));
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_PRISM"));
RadioButton1->setPixmap(image0);
- RadioButton2->close(TRUE);
+ RadioButton2->setPixmap(image2);
+ //RadioButton2->close(TRUE);
RadioButton3->close(TRUE);
GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
- GroupPoints->CheckButton1->hide();
+ //GroupPoints->CheckButton1->hide();
GroupPoints->GroupBox1->setTitle(tr("GEOM_PRISM_BSV"));
GroupPoints->TextLabel1->setText(tr("GEOM_BASE"));
GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
GroupPoints->LineEdit2->setReadOnly( true );
GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
+ GroupPoints2 = new DlgRef_3Sel_QTD(this, "GroupPoints2");
+ GroupPoints2->GroupBox1->setTitle(tr("GEOM_PRISM_BSV_2P"));
+ GroupPoints2->TextLabel1->setText(tr("GEOM_BASE"));
+ GroupPoints2->TextLabel2->setText(tr("GEOM_POINT_I").arg("1"));
+ GroupPoints2->TextLabel3->setText(tr("GEOM_POINT_I").arg("2"));
+ GroupPoints2->PushButton1->setPixmap(image1);
+ GroupPoints2->PushButton2->setPixmap(image1);
+ GroupPoints2->PushButton3->setPixmap(image1);
+
Layout1->addWidget(GroupPoints, 2, 0);
+ Layout1->addWidget(GroupPoints2, 2, 0);
/***************************************************************/
+ setHelpFileName("extrusion.htm");
+
/* Initialisations */
Init();
}
GroupPoints->LineEdit1->setReadOnly( true );
GroupPoints->LineEdit2->setReadOnly( true );
- myOkBase = myOkVec = false;
+ GroupPoints2->LineEdit1->setReadOnly( true );
+ GroupPoints2->LineEdit2->setReadOnly( true );
+ GroupPoints2->LineEdit3->setReadOnly( true );
+
+ //myOkBase = myOkVec = false;
+ myOkBase = myOkVec = myOkPnt1 = myOkPnt2 = false;
/* Get setting of step value from file configuration */
- QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
- double step = St.toDouble();
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
/* min, max, step and decimals for spin boxes & initial values */
GroupPoints->SpinBox_DX->RangeStepAndValidator(-999.999, +999.999, step, 3);
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+ connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+
connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
-
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+
+
+ connect(GroupPoints2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+ connect(GroupPoints2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+ connect(GroupPoints2->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+ connect(GroupPoints2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect(GroupPoints2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect(GroupPoints2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+
+ connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
initName(tr("GEOM_PRISM"));
globalSelection( GEOM_ALLSHAPES );
+ ConstructorsClicked(0);
+}
+
+
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose : Radio button management
+//=================================================================================
+void GenerationGUI_PrismDlg::ConstructorsClicked(int constructorId)
+{
+ disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
+
+ switch (constructorId)
+ {
+ case 0:
+ {
+ globalSelection( GEOM_POINT );
+
+ GroupPoints2->hide();
+ resize(0, 0);
+ GroupPoints->show();
+
+ //GroupPoints->LineEdit1->setFocus();
+ //myEditCurrentArgument = GroupPoints->LineEdit1;
+ //displayPreview();
+
+ break;
+ }
+ case 1:
+ {
+ GroupPoints->hide();
+ resize(0, 0);
+ GroupPoints2->show();
+
+ myEditCurrentArgument = GroupPoints2->LineEdit1;
+ GroupPoints2->LineEdit1->setText("");
+ GroupPoints2->LineEdit2->setText("");
+ GroupPoints2->LineEdit3->setText("");
+ myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
+
+ break;
+ }
+ }
+ displayPreview();
}
erasePreview();
myEditCurrentArgument->setText("");
- if(mySelection->IObjectCount() != 1)
- {
- if(myEditCurrentArgument == GroupPoints->LineEdit1)
- myOkBase = false;
- else if(myEditCurrentArgument == GroupPoints->LineEdit2)
- myOkVec = false;
+ if ( getConstructorId()==0 ) {
+
+ if (IObjectCount() != 1) {
+ if (myEditCurrentArgument == GroupPoints->LineEdit1)
+ myOkBase = false;
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+ myOkVec = false;
return;
}
-
- // nbSel == 1
- Standard_Boolean testResult = Standard_False;
- GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), testResult );
-
- if (!testResult)
- return;
- if(myEditCurrentArgument == GroupPoints->LineEdit1) {
- myOkBase = false;
- TopoDS_Shape S;
-
- if ( !GEOMBase::GetShape(aSelectedObject, S) ||
- S.ShapeType() <= 2)
+ // nbSel == 1
+ Standard_Boolean testResult = Standard_False;
+ GEOM::GEOM_Object_ptr aSelectedObject =
+ GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+
+ if (!testResult)
return;
+
+ if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+ myOkBase = false;
+ TopoDS_Shape S;
- myBase = aSelectedObject;
- myOkBase = true;
- }
- else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
- myVec = aSelectedObject;
- myOkVec = true;
+ if (!GEOMBase::GetShape(aSelectedObject, S) ||
+ S.ShapeType() <= 2)
+ return;
+
+ myBase = aSelectedObject;
+ myOkBase = true;
+ }
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+ myVec = aSelectedObject;
+ myOkVec = true;
+ }
+ myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
+
+ displayPreview();
}
- myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
+
+ else { // getConstructorId()==1 - extrusion using 2 points
+
+ if (IObjectCount() != 1) {
+ if (myEditCurrentArgument == GroupPoints2->LineEdit1)
+ myOkBase = false;
+ else if (myEditCurrentArgument == GroupPoints2->LineEdit2) {
+ myPoint1 = GEOM::GEOM_Object::_nil();
+ myOkPnt1 = false;
+ }
+ else if (myEditCurrentArgument == GroupPoints2->LineEdit3) {
+ myPoint2 = GEOM::GEOM_Object::_nil();
+ myOkPnt2 = false;
+ }
+ return;
+ }
+
+ // nbSel == 1
+ Standard_Boolean testResult = Standard_False;
+ GEOM::GEOM_Object_var aSelectedObject =
+ GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
- displayPreview();
+ if(!testResult || CORBA::is_nil( aSelectedObject ))
+ return;
+
+ if(myEditCurrentArgument == GroupPoints2->LineEdit1) {
+ myBase = aSelectedObject;
+ myOkBase = true;
+ }
+ else if(myEditCurrentArgument == GroupPoints2->LineEdit2) {
+ myPoint1 = aSelectedObject;
+ myOkPnt1 = true;
+ }
+ else if(myEditCurrentArgument == GroupPoints2->LineEdit3) {
+ myPoint2 = aSelectedObject;
+ myOkPnt2 = true;
+ }
+
+ myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
+
+ displayPreview();
+ }
}
myEditCurrentArgument = GroupPoints->LineEdit2;
globalSelection( GEOM_LINE );
}
+ else if(send == GroupPoints2->PushButton1) {
+ GroupPoints2->LineEdit1->setFocus();
+ myEditCurrentArgument = GroupPoints2->LineEdit1;
+ }
+ else if(send == GroupPoints2->PushButton2) {
+ GroupPoints2->LineEdit2->setFocus();
+ myEditCurrentArgument = GroupPoints2->LineEdit2;
+ globalSelection( GEOM_POINT );
+ }
+ else if(send == GroupPoints2->PushButton3) {
+ GroupPoints2->LineEdit3->setFocus();
+ myEditCurrentArgument = GroupPoints2->LineEdit3;
+ globalSelection( GEOM_POINT );
+ }
SelectionIntoArgument();
}
{
QLineEdit* send = (QLineEdit*)sender();
if(send == GroupPoints->LineEdit1 ||
- send == GroupPoints->LineEdit2)
+ send == GroupPoints->LineEdit2 ||
+ send == GroupPoints2->LineEdit1 ||
+ send == GroupPoints2->LineEdit2 ||
+ send == GroupPoints2->LineEdit3 )
{
myEditCurrentArgument = send;
GEOMBase_Skeleton::LineEditReturnPressed();
{
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES );
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- GroupPoints->LineEdit1->setFocus();
- myEditCurrentArgument = GroupPoints->LineEdit1;
- displayPreview();
+ connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ //GroupPoints->LineEdit1->setFocus();
+ //myEditCurrentArgument = GroupPoints->LineEdit1;
+ //displayPreview();
+ ConstructorsClicked( getConstructorId() );
}
}
-
//=================================================================================
// function : getHeight()
// purpose :
//=================================================================================
bool GenerationGUI_PrismDlg::isValid( QString& )
{
- return myOkBase && myOkVec;
+ return myOkBase && ( myOkVec || (myOkPnt1 && myOkPnt2) );
}
//=================================================================================
bool GenerationGUI_PrismDlg::execute( ObjectList& objects )
{
GEOM::GEOM_Object_var anObj;
-
- anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation() )->MakePrismVecH ( myBase, myVec, getHeight() );
-
+
+ switch ( getConstructorId() )
+ {
+ case 0 :
+ {
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+ MakePrismVecH(myBase, myVec, getHeight());
+ break;
+ }
+ case 1 :
+ {
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+ MakePrismTwoPnt(myBase, myPoint1, myPoint2);
+ break;
+ }
+ }
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
double anOldValue = GroupPoints->SpinBox_DX->GetValue();
GroupPoints->SpinBox_DX->SetValue( -anOldValue );
}
-
-
-