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

*** empty log message ***

Browse Source
This commit is contained in:
vsr 2007-10-17 07:08:29 +00:00
parent b0880bc63f
commit 7acd6548a6
4 changed files with 176 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BooleanGUI/BooleanGUI.h
View File

@ -37,7 +37,7 @@ class BooleanGUI : public GEOMGUI
public: public:
enum BooleanOperation { COMMON = 1, CUT = 2, FUSE = 3, SECTION = 4 }; enum BooleanOperation { COMMON = 1, CUT = 2, FUSE = 3, SECTION = 4 };
BooleanGUI( GeometryGUI* parent ); BooleanGUI( GeometryGUI* );
~BooleanGUI(); ~BooleanGUI();
bool OnGUIEvent( int, SUIT_Desktop* ); bool OnGUIEvent( int, SUIT_Desktop* );

140
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -19,24 +19,21 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
//
//
// File : BooleanGUI_Dialog.cxx // File : BooleanGUI_Dialog.cxx
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
// Module : GEOM //
// $Header$
#include "BooleanGUI.h"
#include "BooleanGUI_Dialog.h" #include "BooleanGUI_Dialog.h"
#include "GeometryGUI.h" #include <GEOM_DlgRef.h>
#include "GEOMBase.h" #include <GeometryGUI.h>
#include <GEOMBase.h>
#include "SUIT_ResourceMgr.h" #include <SUIT_ResourceMgr.h>
#include "SUIT_Session.h" #include <SUIT_Session.h>
#include "SalomeApp_Application.h" #include <SalomeApp_Application.h>
#include "LightApp_SelectionMgr.h" #include <LightApp_SelectionMgr.h>
using namespace std;
//================================================================================= //=================================================================================
// class : BooleanGUI_Dialog() // class : BooleanGUI_Dialog()
@ -46,74 +43,70 @@ using namespace std;
// TRUE to construct a modal dialog. // TRUE to construct a modal dialog.
//================================================================================= //=================================================================================
BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, GeometryGUI* theGeometryGUI, BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, GeometryGUI* theGeometryGUI,
QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl) QWidget* parent, bool modal, Qt::WindowFlags fl )
:GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl), : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl ),
myOperation( theOperation ) myOperation( theOperation )
{ {
QPixmap image0; QPixmap image0;
QString aTitle, aCaption; QString aTitle, aCaption;
switch ( myOperation ) switch ( myOperation ) {
{
case BooleanGUI::COMMON: case BooleanGUI::COMMON:
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_COMMON"))); image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_COMMON" ) ) );
aTitle = tr("GEOM_COMMON"); aTitle = tr( "GEOM_COMMON" );
aCaption = tr("GEOM_COMMON_TITLE"); aCaption = tr( "GEOM_COMMON_TITLE" );
setHelpFileName("common.htm"); setHelpFileName( "common.htm" );
break; break;
case BooleanGUI::CUT: case BooleanGUI::CUT:
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CUT"))); image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_CUT" ) ) );
aTitle = tr("GEOM_CUT"); aTitle = tr( "GEOM_CUT" );
aCaption = tr("GEOM_CUT_TITLE"); aCaption = tr( "GEOM_CUT_TITLE" );
setHelpFileName("cut.htm"); setHelpFileName( "cut.htm" );
break; break;
case BooleanGUI::FUSE: case BooleanGUI::FUSE:
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_FUSE"))); image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FUSE" ) ) );
aTitle = tr("GEOM_FUSE"); aTitle = tr( "GEOM_FUSE" );
aCaption = tr("GEOM_FUSE_TITLE"); aCaption = tr( "GEOM_FUSE_TITLE" );
setHelpFileName("fuse.htm"); setHelpFileName( "fuse.htm" );
break; break;
case BooleanGUI::SECTION: case BooleanGUI::SECTION:
image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SECTION"))); image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SECTION" ) ) );
aTitle = tr("GEOM_SECTION"); aTitle = tr( "GEOM_SECTION" );
aCaption = tr("GEOM_SECTION_TITLE"); aCaption = tr( "GEOM_SECTION_TITLE" );
setHelpFileName("section.htm"); setHelpFileName( "section.htm" );
break; break;
} }
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle( aCaption ); setWindowTitle( aCaption );
/***************************************************************/ /***************************************************************/
GroupConstructors->setTitle( aTitle ); mainFrame()->GroupConstructors->setTitle( aTitle );
RadioButton1->setIcon( image0 ); mainFrame()->RadioButton1->setIcon( image0 );
RadioButton2->setAttribute( Qt::WA_DeleteOnClose ); mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
RadioButton2->close(); mainFrame()->RadioButton2->close();
RadioButton3->setAttribute( Qt::WA_DeleteOnClose ); mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
RadioButton3->close(); mainFrame()->RadioButton3->close();
myGroup = new Ui::DlgRef_2Sel_QTD(); myGroup = new DlgRef_2Sel( centralWidget() );
QWidget* aMyGroupWidget = new QWidget(this);
myGroup->setupUi(aMyGroupWidget);
aMyGroupWidget->setObjectName("GroupCommon");
myGroup->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); myGroup->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
if ( myOperation != BooleanGUI::CUT ) if ( myOperation != BooleanGUI::CUT ) {
{ myGroup->TextLabel1->setText( tr( "GEOM_OBJECT_I" ).arg( 1 ) );
myGroup->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1")); myGroup->TextLabel2->setText( tr( "GEOM_OBJECT_I" ).arg( 2 ) );
myGroup->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
} }
else else {
{ myGroup->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
myGroup->TextLabel1->setText(tr("GEOM_MAIN_OBJECT")); myGroup->TextLabel2->setText( tr( "GEOM_TOOL_OBJECT" ) );
myGroup->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
} }
myGroup->PushButton1->setIcon(image1); myGroup->PushButton1->setIcon( image1 );
myGroup->PushButton2->setIcon(image1); myGroup->PushButton2->setIcon( image1 );
myGroup->LineEdit1->setReadOnly( true ); myGroup->LineEdit1->setReadOnly( true );
myGroup->LineEdit2->setReadOnly( true ); myGroup->LineEdit2->setReadOnly( true );
gridLayout1->addWidget(aMyGroupWidget, 2, 0); QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( myGroup );
/***************************************************************/ /***************************************************************/
/* Initialisation */ /* Initialisation */
@ -140,19 +133,19 @@ void BooleanGUI_Dialog::Init()
myEditCurrentArgument = myGroup->LineEdit1; myEditCurrentArgument = myGroup->LineEdit1;
/* signals and slots connections */ /* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect(myGroup->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect( myGroup->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect(myGroup->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect( myGroup->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect(myGroup->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect( myGroup->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect(myGroup->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect( myGroup->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( GroupConstructors->title().toLatin1().constData() ); initName( mainFrame()->GroupConstructors->title() );
globalSelection( GEOM_ALLSHAPES ); globalSelection( GEOM_ALLSHAPES );
} }
@ -191,8 +184,7 @@ void BooleanGUI_Dialog::SelectionIntoArgument()
{ {
myEditCurrentArgument->setText( "" ); myEditCurrentArgument->setText( "" );
if ( IObjectCount() != 1 ) if ( IObjectCount() != 1 ) {
{
if ( myEditCurrentArgument == myGroup->LineEdit1 ) myObject1 = GEOM::GEOM_Object::_nil(); if ( myEditCurrentArgument == myGroup->LineEdit1 ) myObject1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == myGroup->LineEdit2 ) myObject2 = GEOM::GEOM_Object::_nil(); else if ( myEditCurrentArgument == myGroup->LineEdit2 ) myObject2 = GEOM::GEOM_Object::_nil();
return; return;
@ -201,8 +193,7 @@ void BooleanGUI_Dialog::SelectionIntoArgument()
// nbSel == 1 // nbSel == 1
Standard_Boolean aRes = Standard_False; Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes ); GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes && GEOMBase::IsShape( aSelectedObject ) ) if ( !CORBA::is_nil( aSelectedObject ) && aRes && GEOMBase::IsShape( aSelectedObject ) ) {
{
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) ); myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
if ( myEditCurrentArgument == myGroup->LineEdit1 ) myObject1 = aSelectedObject; if ( myEditCurrentArgument == myGroup->LineEdit1 ) myObject1 = aSelectedObject;
else if ( myEditCurrentArgument == myGroup->LineEdit2 ) myObject2 = aSelectedObject; else if ( myEditCurrentArgument == myGroup->LineEdit2 ) myObject2 = aSelectedObject;
@ -233,8 +224,7 @@ void BooleanGUI_Dialog::SetEditCurrentArgument()
void BooleanGUI_Dialog::LineEditReturnPressed() void BooleanGUI_Dialog::LineEditReturnPressed()
{ {
QLineEdit* send = (QLineEdit*)sender(); QLineEdit* send = (QLineEdit*)sender();
if ( send == myGroup->LineEdit1 || send == myGroup->LineEdit2 ) if ( send == myGroup->LineEdit1 || send == myGroup->LineEdit2 ) {
{
myEditCurrentArgument = send; myEditCurrentArgument = send;
GEOMBase_Skeleton::LineEditReturnPressed(); GEOMBase_Skeleton::LineEditReturnPressed();
} }
@ -249,8 +239,8 @@ void BooleanGUI_Dialog::ActivateThisDialog()
{ {
GEOMBase_Skeleton::ActivateThisDialog(); GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES ); globalSelection( GEOM_ALLSHAPES );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
} }
@ -258,9 +248,9 @@ void BooleanGUI_Dialog::ActivateThisDialog()
// function : enterEvent() // function : enterEvent()
// purpose : when mouse enter onto the QWidget // purpose : when mouse enter onto the QWidget
//================================================================================= //=================================================================================
void BooleanGUI_Dialog::enterEvent(QEvent * e) void BooleanGUI_Dialog::enterEvent( QEvent* )
{ {
if ( !GroupConstructors->isEnabled() ) if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog(); ActivateThisDialog();
} }

34
src/BooleanGUI/BooleanGUI_Dialog.h
View File

@ -19,49 +19,47 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
//
//
// File : BooleanGUI_Dialog.h // File : BooleanGUI_Dialog.h
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
// Module : GEOM //
#ifndef BooleanGUI_Dialog_H #ifndef BOOLEANGUI_DIALOG_H
#define BooleanGUI_Dialog_H #define BOOLEANGUI_DIALOG_H
#include "BooleanGUI.h" //for wnt defines #include <GEOMBase_Skeleton.h>
#include "GEOMBase_Skeleton.h" class DlgRef_2Sel;
#include "DlgRef_2Sel_QTD.h"
//================================================================================= //=================================================================================
// class : BooleanGUI_Dialog // class : BooleanGUI_Dialog
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOM_BOOLEANGUI_EXPORT BooleanGUI_Dialog : public GEOMBase_Skeleton class BooleanGUI_Dialog : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT
public: public:
BooleanGUI_Dialog( const int theOperation, GeometryGUI* theGeometryGUI, QWidget* parent = 0, BooleanGUI_Dialog( const int, GeometryGUI*, QWidget* = 0,
const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0); bool = false, Qt::WindowFlags = 0 );
~BooleanGUI_Dialog(); ~BooleanGUI_Dialog();
protected: protected:
// redefined from GEOMBase_Helper // redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& ); virtual bool isValid( QString& );
virtual bool execute( ObjectList& objects ); virtual bool execute( ObjectList& );
private:
void Init();
void enterEvent( QEvent* );
private: private:
int myOperation; int myOperation;
void Init();
void enterEvent(QEvent * e);
GEOM::GEOM_Object_var myObject1; GEOM::GEOM_Object_var myObject1;
GEOM::GEOM_Object_var myObject2; GEOM::GEOM_Object_var myObject2;
Ui::DlgRef_2Sel_QTD* myGroup; DlgRef_2Sel* myGroup;
private slots: private slots:
void ClickOnOk(); void ClickOnOk();
@ -72,4 +70,4 @@ private slots:
void ActivateThisDialog(); void ActivateThisDialog();
}; };
#endif // BooleanGUI_Dialog_H #endif // BOOLEANGUI_DIALOG_H

13
src/BooleanGUI/Makefile.am
View File

@ -19,13 +19,10 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # 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 : BooleanGUI
# #
#
# 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 include $(top_srcdir)/adm_local/unix/make_common_starter.am
@ -36,6 +33,9 @@ lib_LTLIBRARIES = libBooleanGUI.la
# Sources files # Sources files
dist_libBooleanGUI_la_SOURCES = \ dist_libBooleanGUI_la_SOURCES = \
BooleanGUI.h \
BooleanGUI_Dialog.h \
\
BooleanGUI.cxx \ BooleanGUI.cxx \
BooleanGUI_Dialog.cxx BooleanGUI_Dialog.cxx
@ -68,6 +68,7 @@ libBooleanGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMFiltersSelection \
-I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix