ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-01 10:55:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
vsr 2007-10-24 08:17:54 +00:00
parent 652535d466
commit 8491fee81c
74 changed files with 847 additions and 946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -9,18 +9,13 @@
#
AC_INIT([Salome2 Project GEOM module], [4.0.0], [gboulant@CS], [salome])
AC_INIT([Salome2 Project GEOM module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
PACKAGE=salome
AC_SUBST(PACKAGE)
VERSION=4.0.0
XVERSION=0x040000
AC_SUBST(VERSION)
XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
AC_SUBST(XVERSION)
# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)

2
src/BasicGUI/BasicGUI_ArcDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BasicGUI_ArcDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BasicGUI_CircleDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

@ -24,7 +24,7 @@
#include "BasicGUI_CurveDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_EllipseDlg.cxx
View File

@ -24,7 +24,7 @@
#include "BasicGUI_EllipseDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_LineDlg.cxx
View File

@ -25,9 +25,9 @@
#include "BasicGUI_LineDlg.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <GEOM_DlgRef.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>

2
src/BasicGUI/BasicGUI_MarkerDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BasicGUI_MarkerDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_PlaneDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BasicGUI_PlaneDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -33,7 +33,7 @@
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GEOMImpl_Types.hxx>

2
src/BasicGUI/BasicGUI_VectorDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BasicGUI_VectorDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BasicGUI_WorkingPlaneDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
View File

@ -24,7 +24,7 @@
#include "BlocksGUI_BlockDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -24,7 +24,7 @@
#include "BlocksGUI_ExplodeDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
View File

@ -25,7 +25,7 @@
#include "BlocksGUI_PropagateDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>

2
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
View File

@ -24,7 +24,7 @@
#include "BlocksGUI_QuadFaceDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>

2
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
View File

@ -24,7 +24,7 @@
#include "BlocksGUI_TrsfDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -26,7 +26,7 @@
#include "BooleanGUI.h"
#include "BooleanGUI_Dialog.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

43
src/BuildGUI/BuildGUI.cxx
View File

@ -19,18 +19,14 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BooleanGUI.cxx
// Author : Damien COQUERET
// Module : GEOM
// $Header$
// Author : Damien COQUERET, Open CASCADE S.A.S.
//
#include "BuildGUI.h"
#include "SUIT_Desktop.h"
#include "SalomeApp_Application.h"
#include <SUIT_Desktop.h>
#include <SalomeApp_Application.h>
#include "BuildGUI_EdgeDlg.h" // Method EDGE
#include "BuildGUI_WireDlg.h" // Method WIRE
@ -39,14 +35,14 @@
#include "BuildGUI_SolidDlg.h" // Method SOLID
#include "BuildGUI_CompoundDlg.h" // Method COMPOUND
#include "GeometryGUI.h"
#include <GeometryGUI.h>
//=======================================================================
// function : BuildGUI()
// purpose : Constructor
//=======================================================================
BuildGUI::BuildGUI( GeometryGUI* parent )
: GEOMGUI( parent )
: GEOMGUI( parent )
{
}
@ -67,24 +63,25 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
{
getGeometryGUI()->EmitSignalDeactivateDialog();
QDialog* aDlg = NULL;
switch ( theCommandID )
{
case 4081: aDlg = new BuildGUI_EdgeDlg ( getGeometryGUI(), parent, "" ); break;
case 4082: aDlg = new BuildGUI_WireDlg ( getGeometryGUI(), parent, "" ); break;
case 4083: aDlg = new BuildGUI_FaceDlg ( getGeometryGUI(), parent, "" ); break;
case 4084: aDlg = new BuildGUI_ShellDlg ( getGeometryGUI(), parent, "" ); break;
case 4085: aDlg = new BuildGUI_SolidDlg ( getGeometryGUI(), parent, "" ); break;
case 4086: aDlg = new BuildGUI_CompoundDlg( getGeometryGUI(), parent, "" ); break;
QDialog* aDlg = 0;
switch ( theCommandID ) {
case 4081: aDlg = new BuildGUI_EdgeDlg ( getGeometryGUI(), parent ); break;
case 4082: aDlg = new BuildGUI_WireDlg ( getGeometryGUI(), parent ); break;
case 4083: aDlg = new BuildGUI_FaceDlg ( getGeometryGUI(), parent ); break;
case 4084: aDlg = new BuildGUI_ShellDlg ( getGeometryGUI(), parent ); break;
case 4085: aDlg = new BuildGUI_SolidDlg ( getGeometryGUI(), parent ); break;
case 4086: aDlg = new BuildGUI_CompoundDlg( getGeometryGUI(), parent ); break;
default:
getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
break;
}
if ( aDlg != NULL )
if ( aDlg ) {
aDlg->updateGeometry();
aDlg->resize( aDlg->minimumSize() );
aDlg->show();
}
return true;
}
@ -94,7 +91,9 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
//=====================================================================================
extern "C"
{
GEOM_BUILDGUI_EXPORT
#ifdef WIN32
__declspec( dllexport )
#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new BuildGUI( parent );

18
src/BuildGUI/BuildGUI.h
View File

@ -19,30 +19,26 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI.h
// Author : Damien COQUERET
// Module : GEOM
// Author : Damien COQUERET, Open CASCADE S.A.S.
//
#ifndef BUILDGUI_H
#define BUILDGUI_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMGUI.h"
#include <GEOMGUI.h>
//=================================================================================
// class : BuildGUI
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI : public GEOMGUI
class BuildGUI : public GEOMGUI
{
public :
BuildGUI( GeometryGUI* parent );
BuildGUI( GeometryGUI* );
~BuildGUI();
bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent );
bool OnGUIEvent( int, SUIT_Desktop* );
};
#endif
#endif // BUILDGUI_H

83
src/BuildGUI/BuildGUI_CompoundDlg.cxx
View File

@ -19,23 +19,22 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_CompoundDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#include "BuildGUI_CompoundDlg.h"
#include "GEOMImpl_Types.hxx"
#include "GeometryGUI.h"
#include "GEOMBase.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include "SUIT_ResourceMgr.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "LightApp_SelectionMgr.h"
#include <GEOMImpl_Types.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_CompoundDlg()
@ -44,37 +43,35 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, Qt::WindowFlags fl)
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
BuildGUI_CompoundDlg::BuildGUI_CompoundDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
: GEOMBase_Skeleton( theGeometryGUI, parent )
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_COMPOUND" ) ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle(tr("GEOM_COMPOUND_TITLE"));
setWindowTitle( tr( "GEOM_COMPOUND_TITLE" ) );
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_COMPOUND"));
RadioButton1->setIcon(image0);
RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close();
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_COMPOUND" ) );
mainFrame()->RadioButton1->setIcon( image0 );
mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
GroupShapes = new Ui::DlgRef_1Sel_QTD();
QWidget* aGroupShapesWidget = new QWidget(this);
GroupShapes->setupUi(aGroupShapesWidget);
aGroupShapesWidget->setObjectName("GroupShapes");
GroupShapes = new DlgRef_1Sel( centralWidget() );
GroupShapes->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
GroupShapes->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupShapes->PushButton1->setIcon(image1);
GroupShapes->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
GroupShapes->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
GroupShapes->PushButton1->setIcon( image1 );
GroupShapes->LineEdit1->setReadOnly( true );
gridLayout1->addWidget(aGroupShapesWidget, 2, 0);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupShapes );
/***************************************************************/
setHelpFileName("compound.htm");
setHelpFileName( "compound.htm" );
/* Initialisations */
Init();
@ -104,15 +101,15 @@ void BuildGUI_CompoundDlg::Init()
myOkShapes = false;
/* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect(GroupShapes->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( GroupShapes->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( ( (SalomeApp_Application*)(SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL(currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
globalSelection( GEOM_ALLSHAPES );
initName( tr( "GEOM_COMPOUND" ).toLatin1().constData() );
initName( tr( "GEOM_COMPOUND" ) );
}
@ -170,7 +167,7 @@ void BuildGUI_CompoundDlg::SelectionIntoArgument()
void BuildGUI_CompoundDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
if (send != GroupShapes->PushButton1)
if ( send != GroupShapes->PushButton1 )
return;
myEditCurrentArgument = GroupShapes->LineEdit1;
@ -188,8 +185,8 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
}
@ -199,7 +196,7 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
//=================================================================================
void BuildGUI_CompoundDlg::enterEvent(QEvent* e)
{
if ( !GroupConstructors->isEnabled() )
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}

31
src/BuildGUI/BuildGUI_CompoundDlg.h
View File

@ -19,47 +19,44 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : BuildGUI_CompoundDlg.h
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
//
// File : GEOMBase_CompoundDlg.h
// Author : Lucien PIGNOLONI
// Module : GEOM
#ifndef DIALOGBOX_COMPOUND_H
#define DIALOGBOX_COMPOUND_H
#ifndef BUILDGUI_COMPOUNDDLG_H
#define BUILDGUI_COMPOUNDDLG_H
#include "GEOM_BuildGUI.hxx"
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
class DlgRef_1Sel;
//=================================================================================
// class : BuildGUI_CompoundDlg
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton
class BuildGUI_CompoundDlg : public GEOMBase_Skeleton
{
Q_OBJECT
public:
BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
BuildGUI_CompoundDlg( GeometryGUI*, QWidget* = 0 );
~BuildGUI_CompoundDlg();
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& msg );
virtual bool execute( ObjectList& objects );
virtual bool isValid( QString& );
virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent(QEvent* e);
void enterEvent( QEvent* );
private:
GEOM::ListOfGO myShapes;
bool myOkShapes;
Ui::DlgRef_1Sel_QTD* GroupShapes;
DlgRef_1Sel* GroupShapes;
private slots:
void ClickOnOk();
@ -69,4 +66,4 @@ private slots:
void SetEditCurrentArgument();
};
#endif // DIALOGBOX_COMPOUND_H
#endif // BUILDGUI_COMPOUNDDLG_H

115
src/BuildGUI/BuildGUI_EdgeDlg.cxx
View File

@ -19,24 +19,22 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_EdgeDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#include "BuildGUI_EdgeDlg.h"
#include "GeometryGUI.h"
#include "GEOMBase.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include "GEOMImpl_Types.hxx"
#include <GEOMImpl_Types.hxx>
#include "SUIT_ResourceMgr.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "LightApp_SelectionMgr.h"
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_EdgeDlg()
@ -45,41 +43,39 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, Qt::WindowFlags fl)
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
BuildGUI_EdgeDlg::BuildGUI_EdgeDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
: GEOMBase_Skeleton( theGeometryGUI, parent )
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_EDGE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_EDGE" ) ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle(tr("GEOM_EDGE_TITLE"));
setWindowTitle( tr( "GEOM_EDGE_TITLE" ) );
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_EDGE"));
RadioButton1->setIcon(image0);
RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close();
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_EDGE" ) );
mainFrame()->RadioButton1->setIcon( image0 );
mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
GroupPoints = new Ui::DlgRef_2Sel_QTD();
QWidget* aGroupPointsWidget = new QWidget(this);
GroupPoints->setupUi(aGroupPointsWidget);
aGroupPointsWidget->setObjectName("GroupPoints");
GroupPoints = new DlgRef_2Sel( centralWidget() );
GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
GroupPoints->PushButton1->setIcon(image1);
GroupPoints->PushButton2->setIcon(image1);
GroupPoints->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
GroupPoints->TextLabel1->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
GroupPoints->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
GroupPoints->PushButton1->setIcon( image1 );
GroupPoints->PushButton2->setIcon( image1 );
GroupPoints->LineEdit1->setReadOnly( true );
GroupPoints->LineEdit2->setReadOnly( true );
gridLayout1->addWidget(aGroupPointsWidget, 2, 0);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupPoints );
/***************************************************************/
setHelpFileName("edge.htm");
setHelpFileName( "edge.htm" );
/* Initialisations */
Init();
@ -112,19 +108,19 @@ void BuildGUI_EdgeDlg::Init()
globalSelection( GEOM_POINT );
/* signals and slots connections */
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() ) );
connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( GroupPoints->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect( GroupPoints->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_EDGE").toLatin1().constData() );
initName( tr( "GEOM_EDGE" ) );
}
@ -160,28 +156,28 @@ bool BuildGUI_EdgeDlg::ClickOnApply()
void BuildGUI_EdgeDlg::SelectionIntoArgument()
{
erasePreview();
myEditCurrentArgument->setText("");
myEditCurrentArgument->setText( "" );
if(IObjectCount() != 1) {
if(myEditCurrentArgument == GroupPoints->LineEdit1)
if ( IObjectCount() != 1 ) {
if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
myOkPoint1 = false;
else if(myEditCurrentArgument == GroupPoints->LineEdit2)
else if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
myOkPoint2 = false;
return;
}
// nbSel == 1
Standard_Boolean testResult = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
if(!testResult)
if ( !testResult )
return;
if(myEditCurrentArgument == GroupPoints->LineEdit1) {
if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
myPoint1 = aSelectedObject;
myOkPoint1 = true;
}
else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
myPoint2 = aSelectedObject;
myOkPoint2 = true;
}
@ -199,8 +195,7 @@ void BuildGUI_EdgeDlg::SelectionIntoArgument()
void BuildGUI_EdgeDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
if(send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2)
{
if ( send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2 ) {
myEditCurrentArgument = send;
GEOMBase_Skeleton::LineEditReturnPressed();
}
@ -217,11 +212,11 @@ void BuildGUI_EdgeDlg::SetEditCurrentArgument()
QPushButton* send = (QPushButton*)sender();
globalSelection();
if(send == GroupPoints->PushButton1) {
if ( send == GroupPoints->PushButton1 ) {
myEditCurrentArgument = GroupPoints->LineEdit1;
globalSelection( GEOM_POINT );
}
else if(send == GroupPoints->PushButton2) {
else if ( send == GroupPoints->PushButton2 ) {
myEditCurrentArgument = GroupPoints->LineEdit2;
globalSelection( GEOM_POINT );
}
@ -238,8 +233,8 @@ void BuildGUI_EdgeDlg::SetEditCurrentArgument()
void BuildGUI_EdgeDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
globalSelection( GEOM_POINT );
displayPreview();
}
@ -249,9 +244,9 @@ void BuildGUI_EdgeDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void BuildGUI_EdgeDlg::enterEvent(QEvent* e)
void BuildGUI_EdgeDlg::enterEvent( QEvent* )
{
if ( !GroupConstructors->isEnabled() )
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}

31
src/BuildGUI/BuildGUI_EdgeDlg.h
View File

@ -19,48 +19,45 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_EdgeDlg.h
// Author : Lucien PIGNOLONI
// Module : GEOM
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#ifndef DIALOGBOX_EDGE_H
#define DIALOGBOX_EDGE_H
#ifndef BUILDGUI_EDGEDLG_H
#define BUILDGUI_EDGEDLG_H
#include "GEOM_BuildGUI.hxx"
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel_QTD.h"
class DlgRef_2Sel;
//=================================================================================
// class : BuildGUI_EdgeDlg
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton
class BuildGUI_EdgeDlg : public GEOMBase_Skeleton
{
Q_OBJECT
public:
BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
BuildGUI_EdgeDlg( GeometryGUI*, QWidget* = 0 );
~BuildGUI_EdgeDlg();
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& msg );
virtual bool execute( ObjectList& objects );
virtual bool isValid( QString& );
virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent(QEvent* e);
void enterEvent( QEvent* );
private:
GEOM::GEOM_Object_var myPoint1, myPoint2; /* Points containing the edge */
bool myOkPoint1; /* true when myPoint is defined */
bool myOkPoint2;
Ui::DlgRef_2Sel_QTD* GroupPoints;
DlgRef_2Sel* GroupPoints;
private slots:
void ClickOnOk();
@ -71,4 +68,4 @@ private slots:
void SetEditCurrentArgument();
};
#endif // DIALOGBOX_EDGE_H
#endif // BUILDGUI_EDGEDLG_H

112
src/BuildGUI/BuildGUI_FaceDlg.cxx
View File

@ -19,26 +19,23 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_FaceDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#include "BuildGUI_FaceDlg.h"
#include "GEOMImpl_Types.hxx"
#include "TColStd_MapOfInteger.hxx"
#include "GeometryGUI.h"
#include "GEOMBase.h"
#include <GEOMImpl_Types.hxx>
#include <TColStd_MapOfInteger.hxx>
#include "SUIT_ResourceMgr.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "LightApp_SelectionMgr.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
using namespace std;
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_FaceDlg()
@ -47,37 +44,35 @@ using namespace std;
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_FaceDlg::BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, Qt::WindowFlags fl)
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
BuildGUI_FaceDlg::BuildGUI_FaceDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
: GEOMBase_Skeleton( theGeometryGUI, parent )
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_FACE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_FACE" ) ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle(tr("GEOM_FACE_TITLE"));
setWindowTitle( tr( "GEOM_FACE_TITLE" ) );
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_FACE"));
RadioButton1->setIcon(image0);
RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close();
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_FACE" ) );
mainFrame()->RadioButton1->setIcon( image0 );
mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
GroupWire = new Ui::DlgRef_1Sel1Check_QTD();
QWidget* aGroupWireWidget = new QWidget(this);
GroupWire->setupUi(aGroupWireWidget);
aGroupWireWidget->setObjectName("GroupWire");
GroupWire = new DlgRef_1Sel1Check( centralWidget() );
GroupWire->GroupBox1->setTitle(tr("GEOM_FACE_FFW"));
GroupWire->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupWire->CheckButton1->setText(tr("GEOM_FACE_OPT"));
GroupWire->PushButton1->setIcon(image1);
GroupWire->GroupBox1->setTitle( tr( "GEOM_FACE_FFW" ) );
GroupWire->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
GroupWire->CheckButton1->setText( tr( "GEOM_FACE_OPT" ) );
GroupWire->PushButton1->setIcon( image1 );
gridLayout1->addWidget(aGroupWireWidget, 2, 0);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupWire );
/***************************************************************/
setHelpFileName("face.htm");
setHelpFileName( "face.htm" );
/* Initialisations */
Init();
@ -104,7 +99,7 @@ void BuildGUI_FaceDlg::Init()
myEditCurrentArgument = GroupWire->LineEdit1;
GroupWire->LineEdit1->setReadOnly( true );
GroupWire->CheckButton1->setChecked(TRUE);
GroupWire->CheckButton1->setChecked( true );
TColStd_MapOfInteger aMap;
aMap.Add( GEOM_EDGE );
@ -112,14 +107,14 @@ void BuildGUI_FaceDlg::Init()
globalSelection( aMap );
/* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect(GroupWire->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupWire->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( GroupWire->LineEdit1, SIGNAL( returnPressed()), this, SLOT( LineEditReturnPressed() ) );
connect( GroupWire->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName(tr("GEOM_FACE").toLatin1().constData());
initName( tr( "GEOM_FACE" ) );
}
@ -154,24 +149,21 @@ bool BuildGUI_FaceDlg::ClickOnApply()
//=================================================================================
void BuildGUI_FaceDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
myEditCurrentArgument->setText( "" );
QString aName;
int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
int aNbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aName );
if(aNbSel < 1)
{
if ( aNbSel < 1) {
myWires.length(0);
return;
}
GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myWires);
if (!myWires.length())
GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myWires );
if ( !myWires.length() )
return;
if(aNbSel != 1)
aName = tr("%1_objects").arg(aNbSel);
myEditCurrentArgument->setText( aName );
if ( aNbSel != 1 )
aName = tr( "%1_objects" ).arg( aNbSel );
myEditCurrentArgument->setText( aName );
}
@ -184,7 +176,7 @@ void BuildGUI_FaceDlg::SelectionIntoArgument()
void BuildGUI_FaceDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
if (send != GroupWire->PushButton1)
if ( send != GroupWire->PushButton1 )
return;
TColStd_MapOfInteger aMap;
@ -206,8 +198,8 @@ void BuildGUI_FaceDlg::SetEditCurrentArgument()
void BuildGUI_FaceDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
TColStd_MapOfInteger aMap;
aMap.Add( GEOM_EDGE );
aMap.Add( GEOM_WIRE );
@ -219,9 +211,9 @@ void BuildGUI_FaceDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void BuildGUI_FaceDlg::enterEvent(QEvent* e)
void BuildGUI_FaceDlg::enterEvent( QEvent* )
{
if ( !GroupConstructors->isEnabled() )
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
@ -240,7 +232,7 @@ GEOM::GEOM_IOperations_ptr BuildGUI_FaceDlg::createOperation()
//=================================================================================
bool BuildGUI_FaceDlg::isValid( QString& )
{
return (myWires.length() != 0);
return ( myWires.length() != 0 );
}
//=================================================================================

31
src/BuildGUI/BuildGUI_FaceDlg.h
View File

@ -19,46 +19,43 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_FaceDlg.h
// Author : Lucien PIGNOLONI
// Module : GEOM
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#ifndef DIALOGBOX_FACE_H
#define DIALOGBOX_FACE_H
#ifndef BUILDGUI_FACEDLG_H
#define BUILDGUI_FACEDLG_H
#include "GEOM_BuildGUI.hxx"
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check_QTD.h"
class DlgRef_1Sel1Check;
//=================================================================================
// class : BuildGUI_FaceDlg
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton
class BuildGUI_FaceDlg : public GEOMBase_Skeleton
{
Q_OBJECT
public:
BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
BuildGUI_FaceDlg( GeometryGUI*, QWidget* = 0 );
~BuildGUI_FaceDlg();
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& msg );
virtual bool execute( ObjectList& objects );
virtual bool isValid( QString& );
virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent(QEvent* e);
void enterEvent( QEvent* );
private:
GEOM::ListOfGO myWires;
Ui::DlgRef_1Sel1Check_QTD* GroupWire;
DlgRef_1Sel1Check* GroupWire;
private slots:
void ClickOnOk();
@ -68,4 +65,4 @@ private slots:
void SetEditCurrentArgument();
};
#endif // DIALOGBOX_FACE_H
#endif // BUILDGUI_FACEDLG_H

97
src/BuildGUI/BuildGUI_ShellDlg.cxx
View File

@ -19,25 +19,24 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_ShellDlg.cxx
// Author : Damien COQUERET
// Module : GEOM
// $Header$
// Author : Damien COQUERET, Open CASCADE S.A.S.
//
#include "BuildGUI_ShellDlg.h"
#include "GEOMImpl_Types.hxx"
#include "GeometryGUI.h"
#include "GEOMBase.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include "SUIT_ResourceMgr.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "LightApp_SelectionMgr.h"
#include <GEOMImpl_Types.hxx>
#include "TColStd_MapOfInteger.hxx"
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <TColStd_MapOfInteger.hxx>
//=================================================================================
// class : BuildGUI_ShellDlg()
@ -46,34 +45,32 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_ShellDlg::BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, Qt::WindowFlags fl)
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
BuildGUI_ShellDlg::BuildGUI_ShellDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
: GEOMBase_Skeleton( theGeometryGUI, parent )
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SHELL")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_SHELL" ) ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle(tr("GEOM_SHELL_TITLE"));
setWindowTitle( tr( "GEOM_SHELL_TITLE" ) );
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_SHELL"));
RadioButton1->setIcon(image0);
RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close();
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SHELL" ) );
mainFrame()->RadioButton1->setIcon( image0 );
mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
GroupShell = new Ui::DlgRef_1Sel_QTD();
QWidget* aGroupShellWidget = new QWidget(this);
GroupShell->setupUi(aGroupShellWidget);
aGroupShellWidget->setObjectName("GroupShell");
GroupShell = new DlgRef_1Sel( centralWidget() );
GroupShell->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
GroupShell->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupShell->PushButton1->setIcon(image1);
GroupShell->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
GroupShell->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
GroupShell->PushButton1->setIcon( image1 );
GroupShell->LineEdit1->setReadOnly( true );
gridLayout1->addWidget(aGroupShellWidget, 2, 0);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupShell );
/***************************************************************/
setHelpFileName("shell.htm");
@ -106,20 +103,20 @@ void BuildGUI_ShellDlg::Init()
myOkFacesAndShells = false;
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_SHELL);
aMap.Add(GEOM_FACE);
aMap.Add( GEOM_SHELL );
aMap.Add( GEOM_FACE );
globalSelection( aMap );
/* signals and slots connections */
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() ) );
connect(GroupShell->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( GroupShell->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName(tr("GEOM_SHELL").toLatin1().constData());
initName( tr( "GEOM_SHELL" ) );
}
@ -180,12 +177,12 @@ void BuildGUI_ShellDlg::SelectionIntoArgument()
void BuildGUI_ShellDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
if (send != GroupShell->PushButton1)
if ( send != GroupShell->PushButton1 )
return;
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_SHELL);
aMap.Add(GEOM_FACE);
aMap.Add( GEOM_SHELL );
aMap.Add( GEOM_FACE );
globalSelection( aMap );
myEditCurrentArgument = GroupShell->LineEdit1;
@ -201,11 +198,11 @@ void BuildGUI_ShellDlg::SetEditCurrentArgument()
void BuildGUI_ShellDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_SHELL);
aMap.Add(GEOM_FACE);
aMap.Add( GEOM_SHELL );
aMap.Add( GEOM_FACE );
globalSelection( aMap );
}
@ -214,9 +211,9 @@ void BuildGUI_ShellDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void BuildGUI_ShellDlg::enterEvent(QEvent* e)
void BuildGUI_ShellDlg::enterEvent( QEvent* )
{
if ( !GroupConstructors->isEnabled() )
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}

32
src/BuildGUI/BuildGUI_ShellDlg.h
View File

@ -20,46 +20,44 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_ShellDlg.h
// Author : Damien COQUERET
// Module : GEOM
// Author : Damien COQUERET, Open CASCADE S.A.S.
//
#ifndef DIALOGBOX_SHELL_H
#define DIALOGBOX_SHELL_H
#ifndef BUILDGUI_SHELLDLG_H
#define BUILDGUI_SHELLDLG_H
#include "GEOM_BuildGUI.hxx"
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
class DlgRef_1Sel;
//=================================================================================
// class : BuildGUI_ShellDlg
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton
class BuildGUI_ShellDlg : public GEOMBase_Skeleton
{
Q_OBJECT
public:
BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
BuildGUI_ShellDlg( GeometryGUI*, QWidget* = 0 );
~BuildGUI_ShellDlg();
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& msg );
virtual bool execute( ObjectList& objects );
virtual bool isValid( QString& );
virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent(QEvent * e);
void enterEvent( QEvent* );
private:
GEOM::ListOfGO myFacesAndShells;
bool myOkFacesAndShells; /* to check when arguments is defined */
bool myOkFacesAndShells;/* to check when arguments is defined */
Ui::DlgRef_1Sel_QTD* GroupShell;
DlgRef_1Sel* GroupShell;
private slots:
void ClickOnOk();
@ -69,4 +67,4 @@ private slots:
void ActivateThisDialog();
};
#endif // DIALOGBOX_SHELL_H
#endif // BUILDGUI_SHELLDLG_H

118
src/BuildGUI/BuildGUI_SolidDlg.cxx
View File

@ -19,23 +19,22 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_SolidDlg.cxx
// Author : Damien COQUERET
// Module : GEOM
// $Header$
// Author : Damien COQUERET, Open CASCADE S.A.S.
//
#include "BuildGUI_SolidDlg.h"
#include "GEOMImpl_Types.hxx"
#include "GeometryGUI.h"
#include "GEOMBase.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include "SUIT_ResourceMgr.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "LightApp_SelectionMgr.h"
#include <GEOMImpl_Types.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
//=================================================================================
// class : BuildGUI_SolidDlg()
@ -44,38 +43,36 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_SolidDlg::BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, Qt::WindowFlags fl)
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
BuildGUI_SolidDlg::BuildGUI_SolidDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
: GEOMBase_Skeleton( theGeometryGUI, parent )
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SOLID")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_SOLID" ) ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle(tr("GEOM_SOLID_TITLE"));
setWindowTitle( tr( "GEOM_SOLID_TITLE" ) );
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_SOLID"));
RadioButton1->setIcon(image0);
RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close();
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SOLID" ) );
mainFrame()->RadioButton1->setIcon( image0 );
mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
GroupSolid = new Ui::DlgRef_1Sel1Check_QTD();
QWidget* aGroupSolidWidget = new QWidget(this);
GroupSolid->setupUi(aGroupSolidWidget);
aGroupSolidWidget->setObjectName("GroupSolid");
GroupSolid = new DlgRef_1Sel1Check( centralWidget() );
GroupSolid->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
GroupSolid->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupSolid->CheckButton1->setText(tr("GEOM_CREATE_SINGLE_SOLID"));
GroupSolid->PushButton1->setIcon(image1);
GroupSolid->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
GroupSolid->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
GroupSolid->CheckButton1->setText( tr( "GEOM_CREATE_SINGLE_SOLID" ) );
GroupSolid->PushButton1->setIcon( image1 );
GroupSolid->LineEdit1->setReadOnly( true );
gridLayout1->addWidget(aGroupSolidWidget, 2, 0);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupSolid );
/***************************************************************/
setHelpFileName("solid.htm");
setHelpFileName( "solid.htm" );
/* Initialisations */
Init();
@ -108,16 +105,16 @@ void BuildGUI_SolidDlg::Init()
globalSelection( GEOM_SHELL );
/* signals and slots connections */
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() ) );
connect(GroupSolid->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupSolid->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(EnableNameField(bool)));
connect( GroupSolid->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( GroupSolid->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( EnableNameField( bool ) ) );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName(tr("GEOM_SOLID").toLatin1().constData());
initName( tr( "GEOM_SOLID" ) );
}
@ -151,21 +148,21 @@ bool BuildGUI_SolidDlg::ClickOnApply()
//=================================================================================
void BuildGUI_SolidDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
myEditCurrentArgument->setText( "" );
QString aString = "";
myOkShells = false;
int nbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aString);
if (nbSel == 0)
int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString );
if ( nbSel == 0 )
return;
if(nbSel != 1)
aString = tr("%1_objects").arg(nbSel);
if ( nbSel != 1 )
aString = tr( "%1_objects" ).arg( nbSel );
GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myShells);
if (!myShells.length())
GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myShells );
if ( !myShells.length() )
return;
myEditCurrentArgument->setText(aString);
myEditCurrentArgument->setText( aString );
myOkShells = true;
}
@ -176,7 +173,7 @@ void BuildGUI_SolidDlg::SelectionIntoArgument()
void BuildGUI_SolidDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
if(send != GroupSolid->PushButton1)
if ( send != GroupSolid->PushButton1 )
return;
globalSelection( GEOM_SHELL );
@ -194,8 +191,8 @@ void BuildGUI_SolidDlg::SetEditCurrentArgument()
void BuildGUI_SolidDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
globalSelection( GEOM_SHELL );
}
@ -204,9 +201,9 @@ void BuildGUI_SolidDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void BuildGUI_SolidDlg::enterEvent(QEvent* e)
void BuildGUI_SolidDlg::enterEvent( QEvent* )
{
if ( !GroupConstructors->isEnabled() )
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
@ -215,9 +212,9 @@ void BuildGUI_SolidDlg::enterEvent(QEvent* e)
// function : EnableNameField()
// purpose :
//=================================================================================
void BuildGUI_SolidDlg::EnableNameField(bool toEnable)
void BuildGUI_SolidDlg::EnableNameField( bool toEnable )
{
this->GroupBoxName->setEnabled(toEnable);
mainFrame()->GroupBoxName->setEnabled( toEnable );
}
//=================================================================================
@ -246,18 +243,15 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects )
{
bool toCreateSingleSolid = GroupSolid->CheckButton1->isChecked();
if ( toCreateSingleSolid )
{
if ( toCreateSingleSolid ) {
GEOM::GEOM_Object_var anObj = GEOM::GEOM_IShapesOperations::_narrow(
getOperation() )->MakeSolidShells( myShells );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
}
else
{
for ( int i = 0, n = myShells.length(); i< n; i++ )
{
else {
for ( int i = 0, n = myShells.length(); i< n; i++ ) {
GEOM::GEOM_Object_var anObj = GEOM::GEOM_IShapesOperations::_narrow(
getOperation() )->MakeSolidShell( myShells[ i ] );

33
src/BuildGUI/BuildGUI_SolidDlg.h
View File

@ -19,48 +19,45 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_SolidDlg.h
// Author : Damien COQUERET
// Module : GEOM
// Author : Damien COQUERET, Open CASCADE S.A.S.
//
#ifndef DIALOGBOX_SOLID_H
#define DIALOGBOX_SOLID_H
#ifndef BUILDGUI_SOLIDDLG_H
#define BUILDGUI_SOLIDDLG_H
#include "GEOM_BuildGUI.hxx"
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check_QTD.h"
class DlgRef_1Sel1Check;
//=================================================================================
// class : BuildGUI_SolidDlg
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton
class BuildGUI_SolidDlg : public GEOMBase_Skeleton
{
Q_OBJECT
public:
BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
BuildGUI_SolidDlg( GeometryGUI*, QWidget* = 0 );
~BuildGUI_SolidDlg();
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& msg );
virtual bool execute( ObjectList& objects );
virtual bool isValid( QString& );
virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent(QEvent * e);
void enterEvent( QEvent* );
private:
GEOM::ListOfGO myShells;
bool myOkShells; /* to check when arguments is defined and
all shells are closed */
Ui::DlgRef_1Sel1Check_QTD* GroupSolid;
DlgRef_1Sel1Check* GroupSolid;
private slots:
void ClickOnOk();
@ -68,7 +65,7 @@ private slots:
void SetEditCurrentArgument();
void SelectionIntoArgument();
void ActivateThisDialog();
void EnableNameField(bool toEnable);
void EnableNameField( bool );
};
#endif // DIALOGBOX_SOLID_H
#endif // BUILDGUI_SOLIDDLG_H

115
src/BuildGUI/BuildGUI_WireDlg.cxx
View File

@ -19,25 +19,24 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_WireDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#include "BuildGUI_WireDlg.h"
#include "GEOMImpl_Types.hxx"
#include "GeometryGUI.h"
#include "GEOMBase.h"
#include <GEOMImpl_Types.hxx>
#include "SUIT_ResourceMgr.h"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
#include "LightApp_SelectionMgr.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include "TColStd_MapOfInteger.hxx"
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <TColStd_MapOfInteger.hxx>
//=================================================================================
// class : BuildGUI_WireDlg()
@ -46,37 +45,35 @@
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
BuildGUI_WireDlg::BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
const char* name, bool modal, Qt::WindowFlags fl)
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
BuildGUI_WireDlg::BuildGUI_WireDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
: GEOMBase_Skeleton( theGeometryGUI, parent )
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_WIRE")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_WIRE" ) ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle(tr("GEOM_WIRE_TITLE"));
setWindowTitle( tr( "GEOM_WIRE_TITLE" ) );
/***************************************************************/
GroupConstructors->setTitle(tr("GEOM_WIRE"));
RadioButton1->setIcon(image0);
RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close();
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_WIRE" ) );
mainFrame()->RadioButton1->setIcon( image0 );
mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
GroupPoints = new Ui::DlgRef_1Sel_QTD();
QWidget* aGroupPointsWidget = new QWidget(this);
GroupPoints->setupUi(aGroupPointsWidget);
aGroupPointsWidget->setObjectName("GroupPoints");
GroupPoints = new DlgRef_1Sel( centralWidget() );
GroupPoints->GroupBox1->setTitle(tr("GEOM_WIRE_CONNECT"));
GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupPoints->PushButton1->setIcon(image1);
GroupPoints->GroupBox1->setTitle( tr( "GEOM_WIRE_CONNECT" ) );
GroupPoints->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
GroupPoints->PushButton1->setIcon( image1 );
GroupPoints->LineEdit1->setReadOnly( true );
gridLayout1->addWidget(aGroupPointsWidget, 2, 0);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupPoints );
/***************************************************************/
setHelpFileName("wire.htm");
setHelpFileName( "wire.htm" );
/* Initialisations */
Init();
@ -106,18 +103,18 @@ void BuildGUI_WireDlg::Init()
myOkEdgesAndWires = false;
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_WIRE);
aMap.Add(GEOM_EDGE);
aMap.Add( GEOM_WIRE );
aMap.Add( GEOM_EDGE );
globalSelection( aMap );
/* 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(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName(tr("GEOM_WIRE").toLatin1().constData());
initName( tr( "GEOM_WIRE" ) );
}
@ -152,22 +149,22 @@ bool BuildGUI_WireDlg::ClickOnApply()
//=================================================================================
void BuildGUI_WireDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText("");
myEditCurrentArgument->setText( "" );
QString aString = ""; /* name of selection */
myOkEdgesAndWires = false;
int nbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aString);
int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString );
if(nbSel == 0)
if ( nbSel == 0 )
return;
if(nbSel != 1)
aString = tr("%1_objects").arg(nbSel);
if ( nbSel != 1 )
aString = tr( "%1_objects" ).arg( nbSel );
GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myEdgesAndWires);
if (!myEdgesAndWires.length())
GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myEdgesAndWires );
if ( !myEdgesAndWires.length() )
return;
myEditCurrentArgument->setText(aString);
myEditCurrentArgument->setText( aString );
myOkEdgesAndWires = true;
}
@ -179,12 +176,12 @@ void BuildGUI_WireDlg::SelectionIntoArgument()
void BuildGUI_WireDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
if (send != GroupPoints->PushButton1)
if ( send != GroupPoints->PushButton1 )
return;
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_WIRE);
aMap.Add(GEOM_EDGE);
aMap.Add( GEOM_WIRE );
aMap.Add( GEOM_EDGE );
globalSelection( aMap );
myEditCurrentArgument = GroupPoints->LineEdit1;
@ -200,11 +197,11 @@ void BuildGUI_WireDlg::SetEditCurrentArgument()
void BuildGUI_WireDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
TColStd_MapOfInteger aMap;
aMap.Add(GEOM_WIRE);
aMap.Add(GEOM_EDGE);
aMap.Add( GEOM_WIRE );
aMap.Add( GEOM_EDGE );
globalSelection( aMap );
}
@ -213,9 +210,9 @@ void BuildGUI_WireDlg::ActivateThisDialog()
// function : enterEvent()
// purpose :
//=================================================================================
void BuildGUI_WireDlg::enterEvent(QEvent* e)
void BuildGUI_WireDlg::enterEvent( QEvent* )
{
if ( !GroupConstructors->isEnabled() )
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}

31
src/BuildGUI/BuildGUI_WireDlg.h
View File

@ -19,47 +19,44 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : BuildGUI_WireDlg.h
// Author : Lucien PIGNOLONI
// Module : GEOM
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
#ifndef DIALOGBOX_WIRE_H
#define DIALOGBOX_WIRE_H
#ifndef BUILDGUI_WIREDLG_H
#define BUILDGUI_WIREDLG_H
#include "GEOM_BuildGUI.hxx"
#include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
class DlgRef_1Sel;
//=================================================================================
// class : BuildGUI_WireDlg
// purpose :
//=================================================================================
class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton
class BuildGUI_WireDlg : public GEOMBase_Skeleton
{
Q_OBJECT
public:
BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
BuildGUI_WireDlg( GeometryGUI*, QWidget* = 0 );
~BuildGUI_WireDlg();
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& msg );
virtual bool execute( ObjectList& objects );
virtual bool isValid( QString& );
virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent(QEvent* e);
void enterEvent( QEvent* );
private:
GEOM::ListOfGO myEdgesAndWires;
bool myOkEdgesAndWires; /* to check when arguments is defined */
Ui::DlgRef_1Sel_QTD* GroupPoints;
DlgRef_1Sel* GroupPoints;
private slots:
void ClickOnOk();
@ -69,4 +66,4 @@ private slots:
void SetEditCurrentArgument();
};
#endif // DIALOGBOX_WIRE_H
#endif // BUILDGUI_WIREDLG_H

47
src/BuildGUI/GEOM_BuildGUI.hxx
View File

@ -1,47 +0,0 @@
// 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 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
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : GEOM_BuildGUI.hxx
// Author : Alexander A. BORODIN
// Module : GEOM
#ifndef _GEOM_BuildGUI_HXX_
#define _GEOM_BuildGUI_HXX_
#ifdef WNT
#if defined BUILDGUI_EXPORTS
#if defined WIN32
#define GEOM_BUILDGUI_EXPORT __declspec( dllexport )
#else
#define GEOM_BUILDGUI_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_BUILDGUI_EXPORT __declspec( dllimport )
#else
#define GEOM_BUILDGUI_EXPORT
#endif
#endif
#else
#define GEOM_BUILDGUI_EXPORT
#endif
#endif

20
src/BuildGUI/Makefile.am
View File

@ -19,13 +19,10 @@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# File : Makefile.am
# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
# Package : BuildGUI
#
#
# File : Makefile.in
# Author : Damien COQUERET (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : GEOM
# $Header:
include $(top_srcdir)/adm_local/unix/make_common_starter.am
@ -37,6 +34,14 @@ lib_LTLIBRARIES = libBuildGUI.la
# Sources files
dist_libBuildGUI_la_SOURCES = \
BuildGUI.h \
BuildGUI_EdgeDlg.h \
BuildGUI_WireDlg.h \
BuildGUI_FaceDlg.h \
BuildGUI_ShellDlg.h \
BuildGUI_SolidDlg.h \
BuildGUI_CompoundDlg.h \
\
BuildGUI.cxx \
BuildGUI_EdgeDlg.cxx \
BuildGUI_WireDlg.cxx \
@ -53,7 +58,7 @@ MOC_FILES = \
BuildGUI_SolidDlg_moc.cxx \
BuildGUI_CompoundDlg_moc.cxx
nodist_libBuildGUI_la_SOURCES= \
nodist_libBuildGUI_la_SOURCES = \
$(MOC_FILES)
# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
@ -80,6 +85,7 @@ libBuildGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMFiltersSelection \
-I$(top_builddir)/idl \
-I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/salome_adm/unix
libBuildGUI_la_LDFLAGS = \

4
src/DlgRef/GEOM_DlgRef.cxx → src/DlgRef/DlgRef.cxx
View File

@ -17,11 +17,11 @@
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// File : GEOM_DlgRef.cxx
// File : DlgRef.cxx
// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
//
#include "GEOM_DlgRef.h"
#include "DlgRef.h"
//////////////////////////////////////////
// DlgRef_1List1Spin1Btn

2
src/DlgRef/GEOM_DlgRef.h → src/DlgRef/DlgRef.h
View File

@ -17,7 +17,7 @@
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// File : GEOM_DlgRef.h
// File : DlgRef.h
// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
//

6
src/DlgRef/Makefile.am
View File

@ -31,11 +31,11 @@ lib_LTLIBRARIES = libDlgRef.la
# Sources files
dist_libDlgRef_la_SOURCES = \
GEOM_DlgRef.h \
GEOM_DlgRef.cxx
DlgRef.h \
DlgRef.cxx
MOC_FILES = \
GEOM_DlgRef_moc.cxx
DlgRef_moc.cxx
UIC_FILES = \
ui_DlgRef_1List1Spin1Btn_QTD.h \

2
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

@ -25,7 +25,7 @@
#include "EntityGUI_SubShapeDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/GEOMBase/GEOMBase_Skeleton.cxx
View File

@ -26,8 +26,8 @@
#include "GEOMBase_Skeleton.h"
#include "GEOMBase.h"
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOM_DlgRef.h>
#include <SalomeApp_Application.h>
#include <LightApp_Application.h>

2
src/GenerationGUI/GenerationGUI_FillingDlg.cxx
View File

@ -25,7 +25,7 @@
#include "GenerationGUI_FillingDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
View File

@ -25,7 +25,7 @@
#include "GenerationGUI_PipeDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/GenerationGUI/GenerationGUI_PrismDlg.cxx
View File

@ -25,7 +25,7 @@
#include "GenerationGUI_PrismDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/GenerationGUI/GenerationGUI_RevolDlg.cxx
View File

@ -25,7 +25,7 @@
#include "GenerationGUI_RevolDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -32,7 +32,7 @@
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>

9
src/Makefile.am
View File

@ -17,12 +17,9 @@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#
#
# File : Makefile.am
# Author : Patrick GOLDBRONN (CEA)
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : GEOM
# $Header$
# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
# Package : src (source files directory)
#
SUBDIRS = OBJECT ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport STLExport ShHealOper GEOMImpl GEOM_I GEOMClient DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_I_Superv GEOM_SWIG

2
src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
View File

@ -26,7 +26,7 @@
#include "MeasureGUI_CenterMassDlg.h"
#include "MeasureGUI_Widgets.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GEOMBase.h>
#include <SUIT_Session.h>

2
src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
View File

@ -36,7 +36,7 @@
#include <TopExp.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>

2
src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
View File

@ -25,7 +25,7 @@
#include "OperationGUI_ArchimedeDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/OperationGUI/OperationGUI_ChamferDlg.cxx
View File

@ -25,7 +25,7 @@
#include "OperationGUI_ChamferDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/OperationGUI/OperationGUI_ClippingDlg.cxx
View File

@ -25,7 +25,7 @@
#include "OperationGUI_ClippingDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/OperationGUI/OperationGUI_FilletDlg.cxx
View File

@ -25,7 +25,7 @@
#include "OperationGUI_FilletDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/OperationGUI/OperationGUI_MaterialDlg.cxx
View File

@ -25,7 +25,7 @@
#include "OperationGUI_MaterialDlg.h"
#include "OperationGUI_PartitionDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GEOMBase.h>
#include <GeometryGUI.h>

2
src/OperationGUI/OperationGUI_PartitionDlg.cxx
View File

@ -26,7 +26,7 @@
#include "OperationGUI_PartitionDlg.h"
#include "OperationGUI_MaterialDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
View File

@ -25,7 +25,7 @@
#include "PrimitiveGUI_BoxDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
View File

@ -25,7 +25,7 @@
#include "PrimitiveGUI_ConeDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
View File

@ -25,7 +25,7 @@
#include "PrimitiveGUI_CylinderDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
View File

@ -25,7 +25,7 @@
#include "PrimitiveGUI_SphereDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
View File

@ -25,7 +25,7 @@
#include "PrimitiveGUI_TorusDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_ChangeOrientationDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_CloseContourDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_CloseContourDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_DivideEdgeDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_GlueDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_GlueDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_RemoveHolesDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_RemoveIntWiresDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_SewingDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_SewingDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_ShapeProcessDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>

2
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
View File

@ -25,7 +25,7 @@
#include "RepairGUI_SuppressFacesDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_MirrorDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_MultiRotationDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_MultiTranslationDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_OffsetDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_PositionDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_PositionDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_RotationDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
View File

@ -24,7 +24,7 @@
#include "TransformationGUI_ScaleDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>

2
src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
View File

@ -25,7 +25,7 @@
#include "TransformationGUI_TranslationDlg.h"
#include <GEOM_DlgRef.h>
#include <DlgRef.h>
#include <GeometryGUI.h>
#include <GEOMBase.h>