ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-26 22:40:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improve reaction of 'Divide edge' dialog on Display of objects

Browse Source
This commit is contained in:
jfa 2005-10-07 08:31:46 +00:00
parent c1745184cb
commit b6b2fb7cd6
5 changed files with 132 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/BasicGUI/BasicGUI_ArcDlg.cxx
View File

@ -53,9 +53,11 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BasicGUI_ArcDlg::BasicGUI_ArcDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
myGeometryGUI()
BasicGUI_ArcDlg::BasicGUI_ArcDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, WFlags fl)
: GEOMBase_Skeleton(parent, name, modal, WStyle_Customize |
WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
myGeometryGUI(theGeometryGUI)
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ARC")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
@ -129,7 +131,7 @@ void BasicGUI_ArcDlg::Init()
connect(Group3Pnts->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr( "GEOM_ARC" ) );
}
@ -145,10 +147,10 @@ void BasicGUI_ArcDlg::ClickOnOk()
ClickOnCancel();
}
//=======================================================================
//=================================================================================
// function : ClickOnCancel()
// purpose :
//=======================================================================
//=================================================================================
void BasicGUI_ArcDlg::ClickOnCancel()
{
GEOMBase_Skeleton::ClickOnCancel();
@ -249,7 +251,7 @@ void BasicGUI_ArcDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
// myGeometryGUI->SetState( 0 );
globalSelection( GEOM_POINT );
@ -317,7 +319,8 @@ bool BasicGUI_ArcDlg::isValid( QString& msg )
//=================================================================================
bool BasicGUI_ArcDlg::execute( ObjectList& objects )
{
GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeArc( myPoint1, myPoint2, myPoint3 );
GEOM::GEOM_Object_var anObj =
GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->MakeArc(myPoint1, myPoint2, myPoint3);
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
return true;

3
src/DisplayGUI/DisplayGUI.cxx
View File

@ -111,11 +111,13 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
}
case 212: // MENU VIEW - DISPLAY ALL
{
getGeometryGUI()->EmitSignalDeactivateDialog();
myDisplayGUI->DisplayAll();
break;
}
case 213: // MENU VIEW - DISPLAY ONLY
{
getGeometryGUI()->EmitSignalDeactivateDialog();
myDisplayGUI->DisplayOnly();
break;
}
@ -131,6 +133,7 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
}
case 216: // MENU VIEW - DISPLAY
{
getGeometryGUI()->EmitSignalDeactivateDialog();
myDisplayGUI->Display();
break;
}

2
src/RepairGUI/RepairGUI.cxx
View File

@ -111,7 +111,7 @@ bool RepairGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
aDlg = new RepairGUI_RemoveIntWiresDlg( parent, "" );
break;
case 608: // ADD POINT ON EDGE
aDlg = new RepairGUI_DivideEdgeDlg( parent, "" );
aDlg = new RepairGUI_DivideEdgeDlg( getGeometryGUI(), parent, "" );
break;
case 609: // FREE BOUNDARIES
aDlg = new RepairGUI_FreeBoundDlg( getGeometryGUI(), parent );

94
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
View File

@ -48,9 +48,13 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
:GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, WFlags fl)
: GEOMBase_Skeleton(parent, name, modal, WStyle_Customize |
WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
myGeomGUI = theGeometryGUI;
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_DIVIDE_EDGE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
@ -76,7 +80,7 @@ RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg(QWidget* parent, const char* na
myIsParameterGr->find( 0 )->toggle();
QGridLayout* aLay = new QGridLayout( 0, 1, 2, 0, 6, "aLay" );
myValEdt = new QtxDblSpinBox(0., 1., 0.1, GroupPoints->GroupBox1);// QAD_SpinBoxDbl( GroupPoints->GroupBox1, 0., 1., 0.1, 3 );
myValEdt = new QtxDblSpinBox(0., 1., 0.1, GroupPoints->GroupBox1);
myValEdt->setPrecision( 3 );
myValEdt->setValue( 0.5 );
QLabel* aLbl1 = new QLabel( tr( "GEOM_VALUE" ), GroupPoints->GroupBox1 );
@ -128,7 +132,7 @@ void RepairGUI_DivideEdgeDlg::Init()
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
initName( tr( "DEVIDE_EDGE_NEW_OBJECT_NAME" ) );
}
@ -145,7 +149,6 @@ void RepairGUI_DivideEdgeDlg::ClickOnOk()
}
//=================================================================================
// function : ClickOnApply()
// purpose :
@ -153,7 +156,7 @@ void RepairGUI_DivideEdgeDlg::ClickOnOk()
bool RepairGUI_DivideEdgeDlg::ClickOnApply()
{
if ( !onAccept() )
return false;
return false;
initName();
@ -199,32 +202,34 @@ void RepairGUI_DivideEdgeDlg::SelectionIntoArgument()
TopoDS_Shape aShape;
if ( myGeomBase->GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) )
{
const int aType = aShape.ShapeType();
if ( aType <= TopAbs_EDGE ) // edge, wire, face, shell, solid, compound
{
GEOM::short_array anIndexes;
const int aType = aShape.ShapeType();
if ( aType <= TopAbs_EDGE ) // edge, wire, face, shell, solid, compound
{
GEOM::short_array anIndexes;
TColStd_IndexedMapOfInteger aMap;
((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap );
TColStd_IndexedMapOfInteger aMap;
SalomeApp_Application* anApp =
(SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
anApp->selectionMgr()->GetIndexes( anIO, aMap );
if ( !aMap.IsEmpty() ) // subshape selection
{
myIndex = aMap( 1 );
myObject = aSelectedObj;
myEditCurrentArgument->setText( tr( "GEOM_EDGE" ) + "_1" );
}
else if ( aType == TopAbs_EDGE ) // single shape selection
{
myIndex = -1;
myObject = aSelectedObj;
myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
}
else // face, shell, solid or compound was selected, and NOT its subshape.
{
myIndex = -1;
myObject = GEOM::GEOM_Object::_nil();
}
}
if ( !aMap.IsEmpty() ) // subshape selection
{
myIndex = aMap( 1 );
myObject = aSelectedObj;
myEditCurrentArgument->setText( tr( "GEOM_EDGE" ) + "_1" );
}
else if ( aType == TopAbs_EDGE ) // single shape selection
{
myIndex = -1;
myObject = aSelectedObj;
myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
}
else // face, shell, solid or compound was selected, and NOT its subshape.
{
myIndex = -1;
myObject = GEOM::GEOM_Object::_nil();
}
}
}
}
}
@ -254,8 +259,8 @@ void RepairGUI_DivideEdgeDlg::LineEditReturnPressed()
if( sender() == GroupPoints->LineEdit1 )
{
myEditCurrentArgument = GroupPoints->LineEdit1;
GEOMBase_Skeleton::LineEditReturnPressed();
}
GEOMBase_Skeleton::LineEditReturnPressed();
}
}
@ -269,7 +274,6 @@ void RepairGUI_DivideEdgeDlg::DeactivateActiveDialog()
GEOMBase_Skeleton::DeactivateActiveDialog();
}
//=================================================================================
// function : ActivateThisDialog()
// purpose :
@ -278,7 +282,7 @@ void RepairGUI_DivideEdgeDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
myObject = GEOM::GEOM_Object::_nil();
myIndex = -1;
@ -287,7 +291,6 @@ void RepairGUI_DivideEdgeDlg::ActivateThisDialog()
initSelection();
}
//=================================================================================
// function : enterEvent()
// purpose : Mouse enter onto the dialog to activate it
@ -298,7 +301,6 @@ void RepairGUI_DivideEdgeDlg::enterEvent(QEvent* e)
ActivateThisDialog();
}
//=================================================================================
// function : closeEvent()
// purpose :
@ -309,6 +311,7 @@ void RepairGUI_DivideEdgeDlg::closeEvent(QCloseEvent* e)
GEOMBase_Skeleton::closeEvent( e );
}
//=================================================================================
// function : createOperation
// purpose :
@ -324,7 +327,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_DivideEdgeDlg::createOperation()
//=================================================================================
bool RepairGUI_DivideEdgeDlg::isValid( QString& msg )
{
return !myObject->_is_nil();
return !myObject->_is_nil();
}
//=================================================================================
@ -333,13 +336,13 @@ bool RepairGUI_DivideEdgeDlg::isValid( QString& msg )
//=================================================================================
bool RepairGUI_DivideEdgeDlg::execute( ObjectList& objects )
{
GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->DivideEdge(
myObject, myIndex, myValEdt->value(), getIsByParameter() );
bool aResult = !anObj->_is_nil();
if ( aResult )
objects.push_back( anObj._retn() );
GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->DivideEdge
( myObject, myIndex, myValEdt->value(), getIsByParameter() );
bool aResult = !anObj->_is_nil();
if ( aResult )
objects.push_back( anObj._retn() );
return aResult;
return aResult;
}
//=================================================================================
@ -348,7 +351,7 @@ bool RepairGUI_DivideEdgeDlg::execute( ObjectList& objects )
//=================================================================================
bool RepairGUI_DivideEdgeDlg::getIsByParameter() const
{
return myIsParameterGr->find( 0 )->isOn();
return myIsParameterGr->find( 0 )->isOn();
}
//=================================================================================
@ -360,6 +363,3 @@ void RepairGUI_DivideEdgeDlg::initSelection()
GEOM::GEOM_Object_var aNullGeomObject;
localSelection( aNullGeomObject, TopAbs_EDGE ); // load local selection on ALL objects
}

9
src/RepairGUI/RepairGUI_DivideEdgeDlg.h
View File

@ -47,7 +47,8 @@ class RepairGUI_DivideEdgeDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
RepairGUI_DivideEdgeDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~RepairGUI_DivideEdgeDlg();
protected:
@ -64,14 +65,14 @@ private :
bool getIsByParameter() const;
GEOM::GEOM_Object_var myObject;
int myIndex;
GEOM::GEOM_Object_var myObject;
int myIndex;
DlgRef_1Sel_Ext* GroupPoints;
QButtonGroup* myIsParameterGr;
QtxDblSpinBox* myValEdt;
private slots:
protected slots:
void ClickOnOk();
bool ClickOnApply();
void ClickOnCancel();