From: mkr Date: Tue, 10 Jul 2007 11:06:29 +0000 (+0000) Subject: Porting to Qt4. X-Git-Tag: snapshot_171207~27 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f9268f4b0187dfe261c07613eac2cb5493215c33;p=modules%2Fgeom.git Porting to Qt4. --- diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index 8bdee4ae6..35387d0a6 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -28,20 +28,15 @@ #include "EntityGUI.h" #include "GeometryGUI.h" -#include "GEOM_AssemblyBuilder.h" #include "SUIT_Desktop.h" -#include "SUIT_Session.h" #include "SUIT_ViewWindow.h" #include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewManager.h" #include "SalomeApp_Study.h" -#include "SalomeApp_Tools.h" #include "SalomeApp_Application.h" -#include -#include -#include +#include #include "EntityGUI_SketcherDlg.h" // Sketcher #include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE @@ -161,15 +156,18 @@ void EntityGUI::EraseSimulationShape() if ( !app ) return; // get all view windows at the desktop - QPtrList aWndLst = app->desktop()->windows(); + QList aWndLst = app->desktop()->windows(); //get all view windows, which belong to the active study - QPtrList aWndLstAS; + QList aWndLstAS; SUIT_ViewWindow* vw; - for ( vw = aWndLst.first(); vw; vw = aWndLst.next() ) + + QListIterator itWL( aWndLst ); + while ( itWL.hasNext() && (vw = itWL.next()) ) if ( vw->getViewManager()->study() == app->activeStudy() ) aWndLstAS.append( vw ); - for ( vw = aWndLstAS.first(); vw; vw = aWndLstAS.next() ) { + QListIterator itWLAS( aWndLstAS ); + while ( itWLAS.hasNext() && (vw = itWLAS.next()) ) { if ( vw->getViewManager()->getType() == OCCViewer_Viewer::Type() ) { OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(vw->getViewManager()))->getOCCViewer(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); diff --git a/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h index a4fd8c001..0b7356173 100644 --- a/src/EntityGUI/EntityGUI.h +++ b/src/EntityGUI/EntityGUI.h @@ -34,9 +34,10 @@ #include "SALOMEDSClient.hxx" -#include #include +class TopoDS_Shape; + //================================================================================= // class : EntityGUI // purpose : diff --git a/src/EntityGUI/EntityGUI.pro b/src/EntityGUI/EntityGUI.pro new file mode 100644 index 000000000..1d58de18e --- /dev/null +++ b/src/EntityGUI/EntityGUI.pro @@ -0,0 +1,51 @@ +TEMPLATE = lib +TARGET = EntityGUI +DESTDIR = ../../lib +MOC_DIR = ../../moc +OBJECTS_DIR = ../../obj/$$TARGET + +QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml + +VTK_INCLUDES = $$(VTKHOME)/include/vtk + +CASROOT = $$(CASROOT) +CAS_CPPFLAGS = $${CASROOT}/inc + +PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4 + +BOOST_CPPFLAGS = $$(BOOSTDIR)/include + +KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome + +GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome + +CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS + +QT_MT_LIBS = -L$$(QTDIR)/lib -lQtCore -lQtXml -lQtGui -lQtOpenGL + +CAS_TKTopAlgo = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo + +INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection ../SKETCHER $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix + +LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase -lGEOMSketcher -lGEOM $${QT_MT_LIBS} $${CAS_TKTopAlgo} -lTKernel + +CONFIG -= debug release debug_and_release +CONFIG += qt thread debug dll shared + +win32:DEFINES += WIN32 +DEFINES += ENTITYGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG + +HEADERS = GEOM_EntityGUI.hxx + +SOURCES = EntityGUI.cxx +SOURCES += EntityGUI_1Spin.cxx +SOURCES += EntityGUI_2Spin.cxx +SOURCES += EntityGUI_3Spin.cxx +SOURCES += EntityGUI_4Spin.cxx +SOURCES += EntityGUI_SketcherDlg.cxx +SOURCES += EntityGUI_SubShapeDlg.cxx + +includes.files = $$HEADERS +includes.path = ../../include + +INSTALLS += includes diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.cxx b/src/EntityGUI/EntityGUI_1Sel_QTD.cxx deleted file mode 100644 index be05efcad..000000000 --- a/src/EntityGUI/EntityGUI_1Sel_QTD.cxx +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_1Sel_QTD.ui' -** -** Created: Thu Aug 12 19:03:19 2004 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_1Sel_QTD.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_1Sel_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_1Sel_QTD::EntityGUI_1Sel_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_1Sel_QTD" ); - resize( 329, 112 ); - setCaption( trUtf8( "EntityGUI_1Sel_QTD" ) ); - EntityGUI_1Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Sel_QTDLayout"); - - GroupBox1 = new QGroupBox( this, "GroupBox1" ); - GroupBox1->setTitle( trUtf8( "Values" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 6 ); - GroupBox1->layout()->setMargin( 11 ); - GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); - - Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); - - Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); - QSpacerItem* spacer = new QSpacerItem( 0, 163, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout3->addItem( spacer, 2, 0 ); - - buttonApply = new QPushButton( GroupBox1, "buttonApply" ); - buttonApply->setText( trUtf8( "Create" ) ); - - Layout3->addWidget( buttonApply, 0, 0 ); - - Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); - - buttonRedo = new QPushButton( GroupBox1, "buttonRedo" ); - buttonRedo->setText( trUtf8( "Redo" ) ); - - Layout2->addWidget( buttonRedo, 0, 1 ); - - buttonUndo = new QPushButton( GroupBox1, "buttonUndo" ); - buttonUndo->setText( trUtf8( "Undo" ) ); - - Layout2->addWidget( buttonUndo, 0, 0 ); - - Layout3->addLayout( Layout2, 1, 0 ); - - Layout4->addLayout( Layout3, 0, 1 ); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); - TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); - TextLabel1->setText( trUtf8( "TL1" ) ); - - Layout1->addWidget( TextLabel1, 0, 0 ); - QSpacerItem* spacer_2 = new QSpacerItem( 0, 180, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout1->addItem( spacer_2, 1, 2 ); - - PushButton1 = new QPushButton( GroupBox1, "PushButton1" ); - PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) ); - PushButton1->setText( trUtf8( "" ) ); - - Layout1->addWidget( PushButton1, 0, 1 ); - - LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" ); - LineEdit1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, LineEdit1->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( LineEdit1, 0, 2 ); - - Layout4->addLayout( Layout1, 0, 0 ); - - GroupBox1Layout->addLayout( Layout4, 0, 0 ); - - EntityGUI_1Sel_QTDLayout->addWidget( GroupBox1, 0, 0 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_1Sel_QTD::~EntityGUI_1Sel_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.h b/src/EntityGUI/EntityGUI_1Sel_QTD.h index 401ddddc7..aeb0a3fa1 100644 --- a/src/EntityGUI/EntityGUI_1Sel_QTD.h +++ b/src/EntityGUI/EntityGUI_1Sel_QTD.h @@ -1,69 +1,172 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_1Sel_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_1Sel_QTD.ui' ** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:38:07 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_1SEL_QTD_H #define ENTITYGUI_1SEL_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QLineEdit; -class QPushButton; +class Ui_EntityGUI_1Sel_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupBox1; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QGridLayout *gridLayout3; + QSpacerItem *spacerItem; + QPushButton *buttonApply; + QGridLayout *gridLayout4; + QPushButton *buttonRedo; + QPushButton *buttonUndo; + QGridLayout *gridLayout5; + QLabel *TextLabel1; + QSpacerItem *spacerItem1; + QPushButton *PushButton1; + QLineEdit *LineEdit1; -class GEOM_ENTITYGUI_EXPORT EntityGUI_1Sel_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_1Sel_QTD) + { + EntityGUI_1Sel_QTD->setObjectName(QString::fromUtf8("EntityGUI_1Sel_QTD")); + gridLayout = new QGridLayout(EntityGUI_1Sel_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupBox1 = new QGroupBox(EntityGUI_1Sel_QTD); + GroupBox1->setObjectName(QString::fromUtf8("GroupBox1")); + gridLayout1 = new QGridLayout(GroupBox1); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout3 = new QGridLayout(); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(0); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + spacerItem = new QSpacerItem(0, 163, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout3->addItem(spacerItem, 2, 0, 1, 1); + + buttonApply = new QPushButton(GroupBox1); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + + gridLayout3->addWidget(buttonApply, 0, 0, 1, 1); + + gridLayout4 = new QGridLayout(); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(0); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + buttonRedo = new QPushButton(GroupBox1); + buttonRedo->setObjectName(QString::fromUtf8("buttonRedo")); + + gridLayout4->addWidget(buttonRedo, 0, 1, 1, 1); + + buttonUndo = new QPushButton(GroupBox1); + buttonUndo->setObjectName(QString::fromUtf8("buttonUndo")); + + gridLayout4->addWidget(buttonUndo, 0, 0, 1, 1); + + + gridLayout3->addLayout(gridLayout4, 1, 0, 1, 1); + + + gridLayout2->addLayout(gridLayout3, 0, 1, 1, 1); + + gridLayout5 = new QGridLayout(); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(0); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); + TextLabel1 = new QLabel(GroupBox1); + TextLabel1->setObjectName(QString::fromUtf8("TextLabel1")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth()); + TextLabel1->setSizePolicy(sizePolicy); + TextLabel1->setWordWrap(false); + + gridLayout5->addWidget(TextLabel1, 0, 0, 1, 1); + + spacerItem1 = new QSpacerItem(0, 180, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout5->addItem(spacerItem1, 1, 2, 1, 1); + + PushButton1 = new QPushButton(GroupBox1); + PushButton1->setObjectName(QString::fromUtf8("PushButton1")); + QSizePolicy sizePolicy1(static_cast(0), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(PushButton1->sizePolicy().hasHeightForWidth()); + PushButton1->setSizePolicy(sizePolicy1); + + gridLayout5->addWidget(PushButton1, 0, 1, 1, 1); + + LineEdit1 = new QLineEdit(GroupBox1); + LineEdit1->setObjectName(QString::fromUtf8("LineEdit1")); + QSizePolicy sizePolicy2(static_cast(3), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(LineEdit1->sizePolicy().hasHeightForWidth()); + LineEdit1->setSizePolicy(sizePolicy2); + + gridLayout5->addWidget(LineEdit1, 0, 2, 1, 1); + + + gridLayout2->addLayout(gridLayout5, 0, 0, 1, 1); + + + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupBox1, 0, 0, 1, 1); + + + retranslateUi(EntityGUI_1Sel_QTD); + + QSize size(329, 112); + size = size.expandedTo(EntityGUI_1Sel_QTD->minimumSizeHint()); + EntityGUI_1Sel_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_1Sel_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_1Sel_QTD) + { + EntityGUI_1Sel_QTD->setWindowTitle(QApplication::translate("EntityGUI_1Sel_QTD", "EntityGUI_1Sel_QTD", 0, QApplication::UnicodeUTF8)); + GroupBox1->setTitle(QApplication::translate("EntityGUI_1Sel_QTD", "Values", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("EntityGUI_1Sel_QTD", "Create", 0, QApplication::UnicodeUTF8)); + buttonRedo->setText(QApplication::translate("EntityGUI_1Sel_QTD", "Redo", 0, QApplication::UnicodeUTF8)); + buttonUndo->setText(QApplication::translate("EntityGUI_1Sel_QTD", "Undo", 0, QApplication::UnicodeUTF8)); + TextLabel1->setText(QApplication::translate("EntityGUI_1Sel_QTD", "TL1", 0, QApplication::UnicodeUTF8)); + PushButton1->setText(QString()); + Q_UNUSED(EntityGUI_1Sel_QTD); + } // retranslateUi -public: - EntityGUI_1Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_1Sel_QTD(); - - QGroupBox* GroupBox1; - QPushButton* buttonApply; - QPushButton* buttonRedo; - QPushButton* buttonUndo; - QLabel* TextLabel1; - QPushButton* PushButton1; - QLineEdit* LineEdit1; - - -protected: - QGridLayout* EntityGUI_1Sel_QTDLayout; - QGridLayout* GroupBox1Layout; - QGridLayout* Layout4; - QGridLayout* Layout3; - QGridLayout* Layout2; - QGridLayout* Layout1; }; +namespace Ui { + class EntityGUI_1Sel_QTD: public Ui_EntityGUI_1Sel_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_1SEL_QTD_H diff --git a/src/EntityGUI/EntityGUI_1Spin.cxx b/src/EntityGUI/EntityGUI_1Spin.cxx index c8a62963f..14bbb116c 100644 --- a/src/EntityGUI/EntityGUI_1Spin.cxx +++ b/src/EntityGUI/EntityGUI_1Spin.cxx @@ -28,21 +28,24 @@ #include "EntityGUI_1Spin.h" -#include -#include -#include +#include "DlgRef_SpinBox.h" /* * Constructs a EntityGUI_1Spin which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -EntityGUI_1Spin::EntityGUI_1Spin(QWidget* parent, const char* name, WFlags fl) - :EntityGUI_1Spin_QTD(parent, name, fl) +EntityGUI_1Spin::EntityGUI_1Spin(QWidget* parent, const char* name, Qt::WindowFlags fl) + :QWidget(parent, fl) { - SpinBox1->close(TRUE); + setupUi(this); + + setObjectName(name); + + SpinBox1->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox1->close(); SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX"); - Layout1->addWidget(SpinBox_DX, 0, 1); + gridLayout3->addWidget(SpinBox_DX, 0, 1); } diff --git a/src/EntityGUI/EntityGUI_1Spin.h b/src/EntityGUI/EntityGUI_1Spin.h index 5631e0bac..a2e17112d 100644 --- a/src/EntityGUI/EntityGUI_1Spin.h +++ b/src/EntityGUI/EntityGUI_1Spin.h @@ -32,14 +32,15 @@ #include "GEOM_EntityGUI.hxx" #include "EntityGUI_1Spin_QTD.h" -#include "DlgRef_SpinBox.h" -class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public EntityGUI_1Spin_QTD +class DlgRef_SpinBox; + +class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public QWidget, public Ui::EntityGUI_1Spin_QTD { Q_OBJECT public: - EntityGUI_1Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); + EntityGUI_1Spin(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0); ~EntityGUI_1Spin(); DlgRef_SpinBox* SpinBox_DX; diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.cxx b/src/EntityGUI/EntityGUI_1Spin_QTD.cxx deleted file mode 100644 index 98a476cef..000000000 --- a/src/EntityGUI/EntityGUI_1Spin_QTD.cxx +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_1Spin_QTD.ui' -** -** Created: Fri Jul 30 16:05:59 2004 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_1Spin_QTD.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_1Spin_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_1Spin_QTD::EntityGUI_1Spin_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_1Spin_QTD" ); - resize( 255, 112 ); - setCaption( trUtf8( "EntityGUI_1Spin_QTD" ) ); - EntityGUI_1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Spin_QTDLayout"); - - GroupBox1 = new QGroupBox( this, "GroupBox1" ); - GroupBox1->setTitle( trUtf8( "Values" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 6 ); - GroupBox1->layout()->setMargin( 11 ); - GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); - - Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); - TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); - TextLabel1->setText( trUtf8( "TL1" ) ); - - Layout1->addWidget( TextLabel1, 0, 0 ); - - SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" ); - SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox1, 0, 1 ); - QSpacerItem* spacer = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout1->addItem( spacer, 3, 1 ); - - Layout4->addLayout( Layout1, 0, 0 ); - - Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); - - Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); - - buttonRedo = new QPushButton( GroupBox1, "buttonRedo" ); - buttonRedo->setText( trUtf8( "Redo" ) ); - - Layout2->addWidget( buttonRedo, 0, 1 ); - - buttonUndo = new QPushButton( GroupBox1, "buttonUndo" ); - buttonUndo->setText( trUtf8( "Undo" ) ); - - Layout2->addWidget( buttonUndo, 0, 0 ); - - Layout3->addLayout( Layout2, 1, 0 ); - - buttonApply = new QPushButton( GroupBox1, "buttonApply" ); - buttonApply->setText( trUtf8( "Create" ) ); - - Layout3->addWidget( buttonApply, 0, 0 ); - QSpacerItem* spacer_2 = new QSpacerItem( 0, 40, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout3->addItem( spacer_2, 2, 0 ); - - Layout4->addLayout( Layout3, 0, 1 ); - - GroupBox1Layout->addLayout( Layout4, 0, 0 ); - - EntityGUI_1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_1Spin_QTD::~EntityGUI_1Spin_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.h b/src/EntityGUI/EntityGUI_1Spin_QTD.h index e525552bb..7ee33ee37 100644 --- a/src/EntityGUI/EntityGUI_1Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_1Spin_QTD.h @@ -1,68 +1,160 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_1Spin_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_1Spin_QTD.ui' ** -** Created: Fri Jul 30 16:05:59 2004 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:27:13 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_1SPIN_QTD_H #define ENTITYGUI_1SPIN_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QPushButton; -class QSpinBox; +class Ui_EntityGUI_1Spin_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupBox1; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QGridLayout *gridLayout3; + QLabel *TextLabel1; + QSpinBox *SpinBox1; + QSpacerItem *spacerItem; + QGridLayout *gridLayout4; + QGridLayout *gridLayout5; + QPushButton *buttonRedo; + QPushButton *buttonUndo; + QPushButton *buttonApply; + QSpacerItem *spacerItem1; -class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_1Spin_QTD) + { + EntityGUI_1Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_1Spin_QTD")); + gridLayout = new QGridLayout(EntityGUI_1Spin_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupBox1 = new QGroupBox(EntityGUI_1Spin_QTD); + GroupBox1->setObjectName(QString::fromUtf8("GroupBox1")); + gridLayout1 = new QGridLayout(GroupBox1); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout3 = new QGridLayout(); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(0); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + TextLabel1 = new QLabel(GroupBox1); + TextLabel1->setObjectName(QString::fromUtf8("TextLabel1")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth()); + TextLabel1->setSizePolicy(sizePolicy); + TextLabel1->setWordWrap(false); + + gridLayout3->addWidget(TextLabel1, 0, 0, 1, 1); + + SpinBox1 = new QSpinBox(GroupBox1); + SpinBox1->setObjectName(QString::fromUtf8("SpinBox1")); + QSizePolicy sizePolicy1(static_cast(7), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth()); + SpinBox1->setSizePolicy(sizePolicy1); + + gridLayout3->addWidget(SpinBox1, 0, 1, 1, 1); + + spacerItem = new QSpacerItem(0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout3->addItem(spacerItem, 3, 1, 1, 1); + + + gridLayout2->addLayout(gridLayout3, 0, 0, 1, 1); + + gridLayout4 = new QGridLayout(); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(0); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + gridLayout5 = new QGridLayout(); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(0); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); + buttonRedo = new QPushButton(GroupBox1); + buttonRedo->setObjectName(QString::fromUtf8("buttonRedo")); + + gridLayout5->addWidget(buttonRedo, 0, 1, 1, 1); + + buttonUndo = new QPushButton(GroupBox1); + buttonUndo->setObjectName(QString::fromUtf8("buttonUndo")); + + gridLayout5->addWidget(buttonUndo, 0, 0, 1, 1); + + + gridLayout4->addLayout(gridLayout5, 1, 0, 1, 1); + + buttonApply = new QPushButton(GroupBox1); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + + gridLayout4->addWidget(buttonApply, 0, 0, 1, 1); + + spacerItem1 = new QSpacerItem(0, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout4->addItem(spacerItem1, 2, 0, 1, 1); + + + gridLayout2->addLayout(gridLayout4, 0, 1, 1, 1); + + + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupBox1, 0, 0, 1, 1); + + + retranslateUi(EntityGUI_1Spin_QTD); + + QSize size(255, 112); + size = size.expandedTo(EntityGUI_1Spin_QTD->minimumSizeHint()); + EntityGUI_1Spin_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_1Spin_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_1Spin_QTD) + { + EntityGUI_1Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_1Spin_QTD", "EntityGUI_1Spin_QTD", 0, QApplication::UnicodeUTF8)); + GroupBox1->setTitle(QApplication::translate("EntityGUI_1Spin_QTD", "Values", 0, QApplication::UnicodeUTF8)); + TextLabel1->setText(QApplication::translate("EntityGUI_1Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8)); + buttonRedo->setText(QApplication::translate("EntityGUI_1Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8)); + buttonUndo->setText(QApplication::translate("EntityGUI_1Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("EntityGUI_1Spin_QTD", "Create", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_1Spin_QTD); + } // retranslateUi -public: - EntityGUI_1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_1Spin_QTD(); - - QGroupBox* GroupBox1; - QLabel* TextLabel1; - QSpinBox* SpinBox1; - QPushButton* buttonRedo; - QPushButton* buttonUndo; - QPushButton* buttonApply; - - -protected: - QGridLayout* EntityGUI_1Spin_QTDLayout; - QGridLayout* GroupBox1Layout; - QGridLayout* Layout4; - QGridLayout* Layout1; - QGridLayout* Layout3; - QGridLayout* Layout2; }; +namespace Ui { + class EntityGUI_1Spin_QTD: public Ui_EntityGUI_1Spin_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_1SPIN_QTD_H diff --git a/src/EntityGUI/EntityGUI_2Spin.cxx b/src/EntityGUI/EntityGUI_2Spin.cxx index 8ed08eccc..5882b36e9 100644 --- a/src/EntityGUI/EntityGUI_2Spin.cxx +++ b/src/EntityGUI/EntityGUI_2Spin.cxx @@ -28,25 +28,29 @@ #include "EntityGUI_2Spin.h" -#include -#include -#include +#include "DlgRef_SpinBox.h" /* * Constructs a EntityGUI_2Spin which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -EntityGUI_2Spin::EntityGUI_2Spin(QWidget* parent, const char* name, WFlags fl) - :EntityGUI_2Spin_QTD(parent, name, fl) +EntityGUI_2Spin::EntityGUI_2Spin(QWidget* parent, const char* name, Qt::WindowFlags fl) + :QWidget(parent, fl) { - SpinBox1->close(TRUE); - SpinBox2->close(TRUE); + setupUi(this); + + setObjectName(name); + + SpinBox1->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox1->close(); + SpinBox2->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox2->close(); SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX"); - Layout1->addWidget(SpinBox_DX, 0, 1); + gridLayout3->addWidget(SpinBox_DX, 0, 1); SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY"); - Layout1->addWidget(SpinBox_DY, 1, 1); + gridLayout3->addWidget(SpinBox_DY, 1, 1); } diff --git a/src/EntityGUI/EntityGUI_2Spin.h b/src/EntityGUI/EntityGUI_2Spin.h index 9d79e478a..5bf0e6171 100644 --- a/src/EntityGUI/EntityGUI_2Spin.h +++ b/src/EntityGUI/EntityGUI_2Spin.h @@ -32,14 +32,15 @@ #include "GEOM_EntityGUI.hxx" #include "EntityGUI_2Spin_QTD.h" -#include "DlgRef_SpinBox.h" -class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public EntityGUI_2Spin_QTD +class DlgRef_SpinBox; + +class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public QWidget, public Ui::EntityGUI_2Spin_QTD { Q_OBJECT public: - EntityGUI_2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); + EntityGUI_2Spin(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0); ~EntityGUI_2Spin(); DlgRef_SpinBox* SpinBox_DX; diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.cxx b/src/EntityGUI/EntityGUI_2Spin_QTD.cxx deleted file mode 100644 index b6f254d5a..000000000 --- a/src/EntityGUI/EntityGUI_2Spin_QTD.cxx +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_2Spin_QTD.ui' -** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_2Spin_QTD.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_2Spin_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_2Spin_QTD::EntityGUI_2Spin_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_2Spin_QTD" ); - resize( 255, 112 ); - setCaption( trUtf8( "EntityGUI_2Spin_QTD" ) ); - EntityGUI_2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_2Spin_QTDLayout"); - - GroupBox1 = new QGroupBox( this, "GroupBox1" ); - GroupBox1->setTitle( trUtf8( "Values" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 6 ); - GroupBox1->layout()->setMargin( 11 ); - GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); - - Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); - TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); - TextLabel2->setText( trUtf8( "TL2" ) ); - - Layout1->addWidget( TextLabel2, 1, 0 ); - - TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); - TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); - TextLabel1->setText( trUtf8( "TL1" ) ); - - Layout1->addWidget( TextLabel1, 0, 0 ); - - SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" ); - SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox1, 0, 1 ); - - SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" ); - SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox2, 1, 1 ); - QSpacerItem* spacer = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout1->addItem( spacer, 3, 1 ); - - Layout4->addLayout( Layout1, 0, 0 ); - - Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); - QSpacerItem* spacer_2 = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout3->addItem( spacer_2, 2, 0 ); - - Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); - - buttonUndo = new QPushButton( GroupBox1, "buttonUndo" ); - buttonUndo->setText( trUtf8( "Undo" ) ); - - Layout2->addWidget( buttonUndo, 0, 0 ); - - buttonRedo = new QPushButton( GroupBox1, "buttonRedo" ); - buttonRedo->setText( trUtf8( "Redo" ) ); - - Layout2->addWidget( buttonRedo, 0, 1 ); - - Layout3->addLayout( Layout2, 1, 0 ); - - buttonApply = new QPushButton( GroupBox1, "buttonApply" ); - buttonApply->setText( trUtf8( "Create" ) ); - - Layout3->addWidget( buttonApply, 0, 0 ); - - Layout4->addLayout( Layout3, 0, 1 ); - - GroupBox1Layout->addLayout( Layout4, 0, 0 ); - - EntityGUI_2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_2Spin_QTD::~EntityGUI_2Spin_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.h b/src/EntityGUI/EntityGUI_2Spin_QTD.h index 718f80e42..094f9c25f 100644 --- a/src/EntityGUI/EntityGUI_2Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_2Spin_QTD.h @@ -1,70 +1,184 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_2Spin_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_2Spin_QTD.ui' ** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:30:02 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_2SPIN_QTD_H #define ENTITYGUI_2SPIN_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QPushButton; -class QSpinBox; +class Ui_EntityGUI_2Spin_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupBox1; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QGridLayout *gridLayout3; + QLabel *TextLabel2; + QLabel *TextLabel1; + QSpinBox *SpinBox1; + QSpinBox *SpinBox2; + QSpacerItem *spacerItem; + QGridLayout *gridLayout4; + QSpacerItem *spacerItem1; + QGridLayout *gridLayout5; + QPushButton *buttonUndo; + QPushButton *buttonRedo; + QPushButton *buttonApply; -class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_2Spin_QTD) + { + EntityGUI_2Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_2Spin_QTD")); + gridLayout = new QGridLayout(EntityGUI_2Spin_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupBox1 = new QGroupBox(EntityGUI_2Spin_QTD); + GroupBox1->setObjectName(QString::fromUtf8("GroupBox1")); + gridLayout1 = new QGridLayout(GroupBox1); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout3 = new QGridLayout(); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(0); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + TextLabel2 = new QLabel(GroupBox1); + TextLabel2->setObjectName(QString::fromUtf8("TextLabel2")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(TextLabel2->sizePolicy().hasHeightForWidth()); + TextLabel2->setSizePolicy(sizePolicy); + TextLabel2->setWordWrap(false); + + gridLayout3->addWidget(TextLabel2, 1, 0, 1, 1); + + TextLabel1 = new QLabel(GroupBox1); + TextLabel1->setObjectName(QString::fromUtf8("TextLabel1")); + QSizePolicy sizePolicy1(static_cast(0), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth()); + TextLabel1->setSizePolicy(sizePolicy1); + TextLabel1->setWordWrap(false); + + gridLayout3->addWidget(TextLabel1, 0, 0, 1, 1); + + SpinBox1 = new QSpinBox(GroupBox1); + SpinBox1->setObjectName(QString::fromUtf8("SpinBox1")); + QSizePolicy sizePolicy2(static_cast(7), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth()); + SpinBox1->setSizePolicy(sizePolicy2); + + gridLayout3->addWidget(SpinBox1, 0, 1, 1, 1); + + SpinBox2 = new QSpinBox(GroupBox1); + SpinBox2->setObjectName(QString::fromUtf8("SpinBox2")); + QSizePolicy sizePolicy3(static_cast(7), static_cast(0)); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(SpinBox2->sizePolicy().hasHeightForWidth()); + SpinBox2->setSizePolicy(sizePolicy3); + + gridLayout3->addWidget(SpinBox2, 1, 1, 1, 1); + + spacerItem = new QSpacerItem(0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout3->addItem(spacerItem, 3, 1, 1, 1); + + + gridLayout2->addLayout(gridLayout3, 0, 0, 1, 1); + + gridLayout4 = new QGridLayout(); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(0); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + spacerItem1 = new QSpacerItem(0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout4->addItem(spacerItem1, 2, 0, 1, 1); + + gridLayout5 = new QGridLayout(); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(0); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); + buttonUndo = new QPushButton(GroupBox1); + buttonUndo->setObjectName(QString::fromUtf8("buttonUndo")); + + gridLayout5->addWidget(buttonUndo, 0, 0, 1, 1); + + buttonRedo = new QPushButton(GroupBox1); + buttonRedo->setObjectName(QString::fromUtf8("buttonRedo")); + + gridLayout5->addWidget(buttonRedo, 0, 1, 1, 1); + + + gridLayout4->addLayout(gridLayout5, 1, 0, 1, 1); + + buttonApply = new QPushButton(GroupBox1); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + + gridLayout4->addWidget(buttonApply, 0, 0, 1, 1); + + + gridLayout2->addLayout(gridLayout4, 0, 1, 1, 1); + + + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupBox1, 0, 0, 1, 1); + + + retranslateUi(EntityGUI_2Spin_QTD); + + QSize size(255, 112); + size = size.expandedTo(EntityGUI_2Spin_QTD->minimumSizeHint()); + EntityGUI_2Spin_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_2Spin_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_2Spin_QTD) + { + EntityGUI_2Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_2Spin_QTD", "EntityGUI_2Spin_QTD", 0, QApplication::UnicodeUTF8)); + GroupBox1->setTitle(QApplication::translate("EntityGUI_2Spin_QTD", "Values", 0, QApplication::UnicodeUTF8)); + TextLabel2->setText(QApplication::translate("EntityGUI_2Spin_QTD", "TL2", 0, QApplication::UnicodeUTF8)); + TextLabel1->setText(QApplication::translate("EntityGUI_2Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8)); + buttonUndo->setText(QApplication::translate("EntityGUI_2Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8)); + buttonRedo->setText(QApplication::translate("EntityGUI_2Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("EntityGUI_2Spin_QTD", "Create", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_2Spin_QTD); + } // retranslateUi -public: - EntityGUI_2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_2Spin_QTD(); - - QGroupBox* GroupBox1; - QLabel* TextLabel2; - QLabel* TextLabel1; - QSpinBox* SpinBox1; - QSpinBox* SpinBox2; - QPushButton* buttonUndo; - QPushButton* buttonRedo; - QPushButton* buttonApply; - - -protected: - QGridLayout* EntityGUI_2Spin_QTDLayout; - QGridLayout* GroupBox1Layout; - QGridLayout* Layout4; - QGridLayout* Layout1; - QGridLayout* Layout3; - QGridLayout* Layout2; }; +namespace Ui { + class EntityGUI_2Spin_QTD: public Ui_EntityGUI_2Spin_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_2SPIN_QTD_H diff --git a/src/EntityGUI/EntityGUI_3Spin.cxx b/src/EntityGUI/EntityGUI_3Spin.cxx index 8a0fb7e53..da1c8d05e 100644 --- a/src/EntityGUI/EntityGUI_3Spin.cxx +++ b/src/EntityGUI/EntityGUI_3Spin.cxx @@ -28,29 +28,34 @@ #include "EntityGUI_3Spin.h" -#include -#include -#include +#include "DlgRef_SpinBox.h" /* * Constructs a EntityGUI_3Spin which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -EntityGUI_3Spin::EntityGUI_3Spin(QWidget* parent, const char* name, WFlags fl) - :EntityGUI_3Spin_QTD(parent, name, fl) +EntityGUI_3Spin::EntityGUI_3Spin(QWidget* parent, const char* name, Qt::WindowFlags fl) + :QWidget(parent, fl) { - SpinBox1->close(TRUE); - SpinBox2->close(TRUE); - SpinBox3->close(TRUE); + setupUi(this); + + setObjectName(name); + + SpinBox1->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox1->close(); + SpinBox2->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox2->close(); + SpinBox3->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox3->close(); SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX"); - Layout1->addWidget(SpinBox_DX, 0, 1); + gridLayout5->addWidget(SpinBox_DX, 0, 1); SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY"); - Layout1->addWidget(SpinBox_DY, 1, 1); + gridLayout5->addWidget(SpinBox_DY, 1, 1); SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ"); - Layout1->addWidget(SpinBox_DZ, 2, 1); + gridLayout5->addWidget(SpinBox_DZ, 2, 1); } diff --git a/src/EntityGUI/EntityGUI_3Spin.h b/src/EntityGUI/EntityGUI_3Spin.h index 4b612bdf1..8f1fbdc39 100644 --- a/src/EntityGUI/EntityGUI_3Spin.h +++ b/src/EntityGUI/EntityGUI_3Spin.h @@ -32,14 +32,15 @@ #include "GEOM_EntityGUI.hxx" #include "EntityGUI_3Spin_QTD.h" -#include "DlgRef_SpinBox.h" -class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public EntityGUI_3Spin_QTD +class DlgRef_SpinBox; + +class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public QWidget, public Ui::EntityGUI_3Spin_QTD { Q_OBJECT public: - EntityGUI_3Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EntityGUI_3Spin( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 ); ~EntityGUI_3Spin(); DlgRef_SpinBox* SpinBox_DX; diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.cxx b/src/EntityGUI/EntityGUI_3Spin_QTD.cxx deleted file mode 100644 index 98dbf69c5..000000000 --- a/src/EntityGUI/EntityGUI_3Spin_QTD.cxx +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_3Spin_QTD.ui' -** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_3Spin_QTD.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_3Spin_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_3Spin_QTD::EntityGUI_3Spin_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_3Spin_QTD" ); - resize( 255, 125 ); - setCaption( trUtf8( "EntityGUI_3Spin_QTD" ) ); - EntityGUI_3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_3Spin_QTDLayout"); - - GroupBox1 = new QGroupBox( this, "GroupBox1" ); - GroupBox1->setTitle( trUtf8( "Values" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 6 ); - GroupBox1->layout()->setMargin( 11 ); - GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); - - Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); - - Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); - - buttonApply = new QPushButton( GroupBox1, "buttonApply" ); - buttonApply->setText( trUtf8( "Create" ) ); - - Layout3->addWidget( buttonApply, 0, 0 ); - QSpacerItem* spacer = new QSpacerItem( 0, 121, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout3->addItem( spacer, 2, 0 ); - - Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); - - buttonUndo = new QPushButton( GroupBox1, "buttonUndo" ); - buttonUndo->setText( trUtf8( "Undo" ) ); - - Layout2->addWidget( buttonUndo, 0, 0 ); - - buttonRedo = new QPushButton( GroupBox1, "buttonRedo" ); - buttonRedo->setText( trUtf8( "Redo" ) ); - - Layout2->addWidget( buttonRedo, 0, 1 ); - - Layout3->addLayout( Layout2, 1, 0 ); - - Layout4->addLayout( Layout3, 0, 1 ); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); - TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); - TextLabel2->setText( trUtf8( "TL2" ) ); - - Layout1->addWidget( TextLabel2, 1, 0 ); - - TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); - TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); - TextLabel1->setText( trUtf8( "TL1" ) ); - - Layout1->addWidget( TextLabel1, 0, 0 ); - - SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" ); - SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox1, 0, 1 ); - - SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" ); - SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox2, 1, 1 ); - - TextLabel3 = new QLabel( GroupBox1, "TextLabel3" ); - TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); - TextLabel3->setText( trUtf8( "TL3" ) ); - - Layout1->addWidget( TextLabel3, 2, 0 ); - QSpacerItem* spacer_2 = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout1->addItem( spacer_2, 3, 1 ); - - SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" ); - SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox3, 2, 1 ); - - Layout4->addLayout( Layout1, 0, 0 ); - - GroupBox1Layout->addLayout( Layout4, 0, 0 ); - - EntityGUI_3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_3Spin_QTD::~EntityGUI_3Spin_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.h b/src/EntityGUI/EntityGUI_3Spin_QTD.h index 1235b160b..80811fa68 100644 --- a/src/EntityGUI/EntityGUI_3Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_3Spin_QTD.h @@ -1,72 +1,208 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_3Spin_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_3Spin_QTD.ui' ** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:33:45 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_3SPIN_QTD_H #define ENTITYGUI_3SPIN_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QPushButton; -class QSpinBox; +class Ui_EntityGUI_3Spin_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupBox1; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QGridLayout *gridLayout3; + QPushButton *buttonApply; + QSpacerItem *spacerItem; + QGridLayout *gridLayout4; + QPushButton *buttonUndo; + QPushButton *buttonRedo; + QGridLayout *gridLayout5; + QLabel *TextLabel2; + QLabel *TextLabel1; + QSpinBox *SpinBox1; + QSpinBox *SpinBox2; + QLabel *TextLabel3; + QSpacerItem *spacerItem1; + QSpinBox *SpinBox3; -class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_3Spin_QTD) + { + EntityGUI_3Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_3Spin_QTD")); + gridLayout = new QGridLayout(EntityGUI_3Spin_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupBox1 = new QGroupBox(EntityGUI_3Spin_QTD); + GroupBox1->setObjectName(QString::fromUtf8("GroupBox1")); + gridLayout1 = new QGridLayout(GroupBox1); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout3 = new QGridLayout(); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(0); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + buttonApply = new QPushButton(GroupBox1); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + + gridLayout3->addWidget(buttonApply, 0, 0, 1, 1); + + spacerItem = new QSpacerItem(0, 121, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout3->addItem(spacerItem, 2, 0, 1, 1); + + gridLayout4 = new QGridLayout(); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(0); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + buttonUndo = new QPushButton(GroupBox1); + buttonUndo->setObjectName(QString::fromUtf8("buttonUndo")); + + gridLayout4->addWidget(buttonUndo, 0, 0, 1, 1); + + buttonRedo = new QPushButton(GroupBox1); + buttonRedo->setObjectName(QString::fromUtf8("buttonRedo")); + + gridLayout4->addWidget(buttonRedo, 0, 1, 1, 1); + + + gridLayout3->addLayout(gridLayout4, 1, 0, 1, 1); + + + gridLayout2->addLayout(gridLayout3, 0, 1, 1, 1); + + gridLayout5 = new QGridLayout(); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(0); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); + TextLabel2 = new QLabel(GroupBox1); + TextLabel2->setObjectName(QString::fromUtf8("TextLabel2")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(TextLabel2->sizePolicy().hasHeightForWidth()); + TextLabel2->setSizePolicy(sizePolicy); + TextLabel2->setWordWrap(false); + + gridLayout5->addWidget(TextLabel2, 1, 0, 1, 1); + + TextLabel1 = new QLabel(GroupBox1); + TextLabel1->setObjectName(QString::fromUtf8("TextLabel1")); + QSizePolicy sizePolicy1(static_cast(0), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth()); + TextLabel1->setSizePolicy(sizePolicy1); + TextLabel1->setWordWrap(false); + + gridLayout5->addWidget(TextLabel1, 0, 0, 1, 1); + + SpinBox1 = new QSpinBox(GroupBox1); + SpinBox1->setObjectName(QString::fromUtf8("SpinBox1")); + QSizePolicy sizePolicy2(static_cast(7), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth()); + SpinBox1->setSizePolicy(sizePolicy2); + + gridLayout5->addWidget(SpinBox1, 0, 1, 1, 1); + + SpinBox2 = new QSpinBox(GroupBox1); + SpinBox2->setObjectName(QString::fromUtf8("SpinBox2")); + QSizePolicy sizePolicy3(static_cast(7), static_cast(0)); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(SpinBox2->sizePolicy().hasHeightForWidth()); + SpinBox2->setSizePolicy(sizePolicy3); + + gridLayout5->addWidget(SpinBox2, 1, 1, 1, 1); + + TextLabel3 = new QLabel(GroupBox1); + TextLabel3->setObjectName(QString::fromUtf8("TextLabel3")); + QSizePolicy sizePolicy4(static_cast(0), static_cast(0)); + sizePolicy4.setHorizontalStretch(0); + sizePolicy4.setVerticalStretch(0); + sizePolicy4.setHeightForWidth(TextLabel3->sizePolicy().hasHeightForWidth()); + TextLabel3->setSizePolicy(sizePolicy4); + TextLabel3->setWordWrap(false); + + gridLayout5->addWidget(TextLabel3, 2, 0, 1, 1); + + spacerItem1 = new QSpacerItem(0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout5->addItem(spacerItem1, 3, 1, 1, 1); + + SpinBox3 = new QSpinBox(GroupBox1); + SpinBox3->setObjectName(QString::fromUtf8("SpinBox3")); + QSizePolicy sizePolicy5(static_cast(7), static_cast(0)); + sizePolicy5.setHorizontalStretch(0); + sizePolicy5.setVerticalStretch(0); + sizePolicy5.setHeightForWidth(SpinBox3->sizePolicy().hasHeightForWidth()); + SpinBox3->setSizePolicy(sizePolicy5); + + gridLayout5->addWidget(SpinBox3, 2, 1, 1, 1); + + + gridLayout2->addLayout(gridLayout5, 0, 0, 1, 1); + + + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupBox1, 0, 0, 1, 1); + + + retranslateUi(EntityGUI_3Spin_QTD); + + QSize size(255, 125); + size = size.expandedTo(EntityGUI_3Spin_QTD->minimumSizeHint()); + EntityGUI_3Spin_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_3Spin_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_3Spin_QTD) + { + EntityGUI_3Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_3Spin_QTD", "EntityGUI_3Spin_QTD", 0, QApplication::UnicodeUTF8)); + GroupBox1->setTitle(QApplication::translate("EntityGUI_3Spin_QTD", "Values", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("EntityGUI_3Spin_QTD", "Create", 0, QApplication::UnicodeUTF8)); + buttonUndo->setText(QApplication::translate("EntityGUI_3Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8)); + buttonRedo->setText(QApplication::translate("EntityGUI_3Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8)); + TextLabel2->setText(QApplication::translate("EntityGUI_3Spin_QTD", "TL2", 0, QApplication::UnicodeUTF8)); + TextLabel1->setText(QApplication::translate("EntityGUI_3Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8)); + TextLabel3->setText(QApplication::translate("EntityGUI_3Spin_QTD", "TL3", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_3Spin_QTD); + } // retranslateUi -public: - EntityGUI_3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_3Spin_QTD(); - - QGroupBox* GroupBox1; - QPushButton* buttonApply; - QPushButton* buttonUndo; - QPushButton* buttonRedo; - QLabel* TextLabel2; - QLabel* TextLabel1; - QSpinBox* SpinBox1; - QSpinBox* SpinBox2; - QLabel* TextLabel3; - QSpinBox* SpinBox3; - - -protected: - QGridLayout* EntityGUI_3Spin_QTDLayout; - QGridLayout* GroupBox1Layout; - QGridLayout* Layout4; - QGridLayout* Layout3; - QGridLayout* Layout2; - QGridLayout* Layout1; }; +namespace Ui { + class EntityGUI_3Spin_QTD: public Ui_EntityGUI_3Spin_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_3SPIN_QTD_H diff --git a/src/EntityGUI/EntityGUI_4Spin.cxx b/src/EntityGUI/EntityGUI_4Spin.cxx index 76ea42b22..4f5e888bc 100644 --- a/src/EntityGUI/EntityGUI_4Spin.cxx +++ b/src/EntityGUI/EntityGUI_4Spin.cxx @@ -28,33 +28,39 @@ #include "EntityGUI_4Spin.h" -#include -#include -#include +#include "DlgRef_SpinBox.h" /* * Constructs a EntityGUI_4Spin which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -EntityGUI_4Spin::EntityGUI_4Spin(QWidget* parent, const char* name, WFlags fl) - :EntityGUI_4Spin_QTD(parent, name, fl) +EntityGUI_4Spin::EntityGUI_4Spin(QWidget* parent, const char* name, Qt::WindowFlags fl) + :QWidget(parent, fl) { - SpinBox1->close(TRUE); - SpinBox2->close(TRUE); - SpinBox3->close(TRUE); - SpinBox4->close(TRUE); + setupUi(this); + + setObjectName(name); + + SpinBox1->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox1->close(); + SpinBox2->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox2->close(); + SpinBox3->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox3->close(); + SpinBox4->setAttribute( Qt::WA_DeleteOnClose ); + SpinBox4->close(); SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX"); - Layout1->addWidget(SpinBox_DX, 0, 1); + gridLayout5->addWidget(SpinBox_DX, 0, 1); SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY"); - Layout1->addWidget(SpinBox_DY, 1, 1); + gridLayout5->addWidget(SpinBox_DY, 1, 1); SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ"); - Layout1->addWidget(SpinBox_DZ, 2, 1); + gridLayout5->addWidget(SpinBox_DZ, 2, 1); SpinBox_DS = new DlgRef_SpinBox(GroupBox1, "SpinBox_DS"); - Layout1->addWidget(SpinBox_DS, 3, 1); + gridLayout5->addWidget(SpinBox_DS, 3, 1); } diff --git a/src/EntityGUI/EntityGUI_4Spin.h b/src/EntityGUI/EntityGUI_4Spin.h index eeaf1965b..dcd5c6b14 100644 --- a/src/EntityGUI/EntityGUI_4Spin.h +++ b/src/EntityGUI/EntityGUI_4Spin.h @@ -32,14 +32,15 @@ #include "GEOM_EntityGUI.hxx" #include "EntityGUI_4Spin_QTD.h" -#include "DlgRef_SpinBox.h" -class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public EntityGUI_4Spin_QTD +class DlgRef_SpinBox; + +class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public QWidget, public Ui::EntityGUI_4Spin_QTD { Q_OBJECT public: - EntityGUI_4Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EntityGUI_4Spin( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 ); ~EntityGUI_4Spin(); DlgRef_SpinBox* SpinBox_DX; diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.cxx b/src/EntityGUI/EntityGUI_4Spin_QTD.cxx deleted file mode 100644 index 8d8debd7e..000000000 --- a/src/EntityGUI/EntityGUI_4Spin_QTD.cxx +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_4Spin_QTD.ui' -** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_4Spin_QTD.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_4Spin_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_4Spin_QTD::EntityGUI_4Spin_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_4Spin_QTD" ); - resize( 255, 154 ); - setCaption( trUtf8( "EntityGUI_4Spin_QTD" ) ); - EntityGUI_4Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_4Spin_QTDLayout"); - - GroupBox1 = new QGroupBox( this, "GroupBox1" ); - GroupBox1->setTitle( trUtf8( "Values" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 6 ); - GroupBox1->layout()->setMargin( 11 ); - GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); - - Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); - - Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); - - Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); - - buttonRedo = new QPushButton( GroupBox1, "buttonRedo" ); - buttonRedo->setText( trUtf8( "Redo" ) ); - - Layout2->addWidget( buttonRedo, 0, 1 ); - - buttonUndo = new QPushButton( GroupBox1, "buttonUndo" ); - buttonUndo->setText( trUtf8( "Undo" ) ); - - Layout2->addWidget( buttonUndo, 0, 0 ); - - Layout3->addLayout( Layout2, 1, 0 ); - QSpacerItem* spacer = new QSpacerItem( 0, 45, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout3->addItem( spacer, 2, 0 ); - - buttonApply = new QPushButton( GroupBox1, "buttonApply" ); - buttonApply->setText( trUtf8( "Create" ) ); - - Layout3->addWidget( buttonApply, 0, 0 ); - - Layout4->addLayout( Layout3, 0, 1 ); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" ); - SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox3, 2, 1 ); - - SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" ); - SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox2, 1, 1 ); - - TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); - TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); - TextLabel2->setText( trUtf8( "TL2" ) ); - - Layout1->addWidget( TextLabel2, 1, 0 ); - QSpacerItem* spacer_2 = new QSpacerItem( 0, 70, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout1->addItem( spacer_2, 4, 1 ); - - SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" ); - SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox4, 3, 1 ); - - TextLabel3 = new QLabel( GroupBox1, "TextLabel3" ); - TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); - TextLabel3->setText( trUtf8( "TL3" ) ); - - Layout1->addWidget( TextLabel3, 2, 0 ); - - SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" ); - SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( SpinBox1, 0, 1 ); - - TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); - TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); - TextLabel1->setText( trUtf8( "TL1" ) ); - - Layout1->addWidget( TextLabel1, 0, 0 ); - - TextLabel4 = new QLabel( GroupBox1, "TextLabel4" ); - TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) ); - TextLabel4->setText( trUtf8( "TL4" ) ); - - Layout1->addWidget( TextLabel4, 3, 0 ); - - Layout4->addLayout( Layout1, 0, 0 ); - - GroupBox1Layout->addLayout( Layout4, 0, 0 ); - - EntityGUI_4Spin_QTDLayout->addWidget( GroupBox1, 0, 0 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_4Spin_QTD::~EntityGUI_4Spin_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.h b/src/EntityGUI/EntityGUI_4Spin_QTD.h index 6ec375d90..457de0b39 100644 --- a/src/EntityGUI/EntityGUI_4Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_4Spin_QTD.h @@ -1,74 +1,232 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_4Spin_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_4Spin_QTD.ui' ** -** Created: Fri Jul 30 16:06:00 2004 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:35:47 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_4SPIN_QTD_H #define ENTITYGUI_4SPIN_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QPushButton; -class QSpinBox; +class Ui_EntityGUI_4Spin_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupBox1; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QGridLayout *gridLayout3; + QGridLayout *gridLayout4; + QPushButton *buttonRedo; + QPushButton *buttonUndo; + QSpacerItem *spacerItem; + QPushButton *buttonApply; + QGridLayout *gridLayout5; + QSpinBox *SpinBox3; + QSpinBox *SpinBox2; + QLabel *TextLabel2; + QSpacerItem *spacerItem1; + QSpinBox *SpinBox4; + QLabel *TextLabel3; + QSpinBox *SpinBox1; + QLabel *TextLabel1; + QLabel *TextLabel4; -class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_4Spin_QTD) + { + EntityGUI_4Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_4Spin_QTD")); + gridLayout = new QGridLayout(EntityGUI_4Spin_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupBox1 = new QGroupBox(EntityGUI_4Spin_QTD); + GroupBox1->setObjectName(QString::fromUtf8("GroupBox1")); + gridLayout1 = new QGridLayout(GroupBox1); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout3 = new QGridLayout(); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(0); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + gridLayout4 = new QGridLayout(); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(0); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + buttonRedo = new QPushButton(GroupBox1); + buttonRedo->setObjectName(QString::fromUtf8("buttonRedo")); + + gridLayout4->addWidget(buttonRedo, 0, 1, 1, 1); + + buttonUndo = new QPushButton(GroupBox1); + buttonUndo->setObjectName(QString::fromUtf8("buttonUndo")); + + gridLayout4->addWidget(buttonUndo, 0, 0, 1, 1); + + + gridLayout3->addLayout(gridLayout4, 1, 0, 1, 1); + + spacerItem = new QSpacerItem(0, 45, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout3->addItem(spacerItem, 2, 0, 1, 1); + + buttonApply = new QPushButton(GroupBox1); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + + gridLayout3->addWidget(buttonApply, 0, 0, 1, 1); + + + gridLayout2->addLayout(gridLayout3, 0, 1, 1, 1); + + gridLayout5 = new QGridLayout(); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(0); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); + SpinBox3 = new QSpinBox(GroupBox1); + SpinBox3->setObjectName(QString::fromUtf8("SpinBox3")); + QSizePolicy sizePolicy(static_cast(7), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(SpinBox3->sizePolicy().hasHeightForWidth()); + SpinBox3->setSizePolicy(sizePolicy); + + gridLayout5->addWidget(SpinBox3, 2, 1, 1, 1); + + SpinBox2 = new QSpinBox(GroupBox1); + SpinBox2->setObjectName(QString::fromUtf8("SpinBox2")); + QSizePolicy sizePolicy1(static_cast(7), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(SpinBox2->sizePolicy().hasHeightForWidth()); + SpinBox2->setSizePolicy(sizePolicy1); + + gridLayout5->addWidget(SpinBox2, 1, 1, 1, 1); + + TextLabel2 = new QLabel(GroupBox1); + TextLabel2->setObjectName(QString::fromUtf8("TextLabel2")); + QSizePolicy sizePolicy2(static_cast(0), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(TextLabel2->sizePolicy().hasHeightForWidth()); + TextLabel2->setSizePolicy(sizePolicy2); + TextLabel2->setWordWrap(false); + + gridLayout5->addWidget(TextLabel2, 1, 0, 1, 1); + + spacerItem1 = new QSpacerItem(0, 70, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout5->addItem(spacerItem1, 4, 1, 1, 1); + + SpinBox4 = new QSpinBox(GroupBox1); + SpinBox4->setObjectName(QString::fromUtf8("SpinBox4")); + QSizePolicy sizePolicy3(static_cast(7), static_cast(0)); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(SpinBox4->sizePolicy().hasHeightForWidth()); + SpinBox4->setSizePolicy(sizePolicy3); + + gridLayout5->addWidget(SpinBox4, 3, 1, 1, 1); + + TextLabel3 = new QLabel(GroupBox1); + TextLabel3->setObjectName(QString::fromUtf8("TextLabel3")); + QSizePolicy sizePolicy4(static_cast(0), static_cast(0)); + sizePolicy4.setHorizontalStretch(0); + sizePolicy4.setVerticalStretch(0); + sizePolicy4.setHeightForWidth(TextLabel3->sizePolicy().hasHeightForWidth()); + TextLabel3->setSizePolicy(sizePolicy4); + TextLabel3->setWordWrap(false); + + gridLayout5->addWidget(TextLabel3, 2, 0, 1, 1); + + SpinBox1 = new QSpinBox(GroupBox1); + SpinBox1->setObjectName(QString::fromUtf8("SpinBox1")); + QSizePolicy sizePolicy5(static_cast(7), static_cast(0)); + sizePolicy5.setHorizontalStretch(0); + sizePolicy5.setVerticalStretch(0); + sizePolicy5.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth()); + SpinBox1->setSizePolicy(sizePolicy5); + + gridLayout5->addWidget(SpinBox1, 0, 1, 1, 1); + + TextLabel1 = new QLabel(GroupBox1); + TextLabel1->setObjectName(QString::fromUtf8("TextLabel1")); + QSizePolicy sizePolicy6(static_cast(0), static_cast(0)); + sizePolicy6.setHorizontalStretch(0); + sizePolicy6.setVerticalStretch(0); + sizePolicy6.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth()); + TextLabel1->setSizePolicy(sizePolicy6); + TextLabel1->setWordWrap(false); + + gridLayout5->addWidget(TextLabel1, 0, 0, 1, 1); + + TextLabel4 = new QLabel(GroupBox1); + TextLabel4->setObjectName(QString::fromUtf8("TextLabel4")); + QSizePolicy sizePolicy7(static_cast(0), static_cast(0)); + sizePolicy7.setHorizontalStretch(0); + sizePolicy7.setVerticalStretch(0); + sizePolicy7.setHeightForWidth(TextLabel4->sizePolicy().hasHeightForWidth()); + TextLabel4->setSizePolicy(sizePolicy7); + TextLabel4->setWordWrap(false); + + gridLayout5->addWidget(TextLabel4, 3, 0, 1, 1); + + + gridLayout2->addLayout(gridLayout5, 0, 0, 1, 1); + + + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupBox1, 0, 0, 1, 1); + + + retranslateUi(EntityGUI_4Spin_QTD); + + QSize size(255, 154); + size = size.expandedTo(EntityGUI_4Spin_QTD->minimumSizeHint()); + EntityGUI_4Spin_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_4Spin_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_4Spin_QTD) + { + EntityGUI_4Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_4Spin_QTD", "EntityGUI_4Spin_QTD", 0, QApplication::UnicodeUTF8)); + GroupBox1->setTitle(QApplication::translate("EntityGUI_4Spin_QTD", "Values", 0, QApplication::UnicodeUTF8)); + buttonRedo->setText(QApplication::translate("EntityGUI_4Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8)); + buttonUndo->setText(QApplication::translate("EntityGUI_4Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("EntityGUI_4Spin_QTD", "Create", 0, QApplication::UnicodeUTF8)); + TextLabel2->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL2", 0, QApplication::UnicodeUTF8)); + TextLabel3->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL3", 0, QApplication::UnicodeUTF8)); + TextLabel1->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8)); + TextLabel4->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL4", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_4Spin_QTD); + } // retranslateUi -public: - EntityGUI_4Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_4Spin_QTD(); - - QGroupBox* GroupBox1; - QPushButton* buttonRedo; - QPushButton* buttonUndo; - QPushButton* buttonApply; - QSpinBox* SpinBox3; - QSpinBox* SpinBox2; - QLabel* TextLabel2; - QSpinBox* SpinBox4; - QLabel* TextLabel3; - QSpinBox* SpinBox1; - QLabel* TextLabel1; - QLabel* TextLabel4; - - -protected: - QGridLayout* EntityGUI_4Spin_QTDLayout; - QGridLayout* GroupBox1Layout; - QGridLayout* Layout4; - QGridLayout* Layout3; - QGridLayout* Layout2; - QGridLayout* Layout1; }; +namespace Ui { + class EntityGUI_4Spin_QTD: public Ui_EntityGUI_4Spin_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_4SPIN_QTD_H diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.cxx b/src/EntityGUI/EntityGUI_Dir1_QTD.cxx deleted file mode 100644 index 9f051b216..000000000 --- a/src/EntityGUI/EntityGUI_Dir1_QTD.cxx +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_Dir1_QTD.ui' -** -** Created: ven déc 12 11:17:09 2003 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_Dir1_QTD.h" - -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_Dir1_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_Dir1_QTD::EntityGUI_Dir1_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_Dir1_QTD" ); - resize( 131, 123 ); - setCaption( trUtf8( "EntityGUI_Dir1_QTD" ) ); - EntityGUI_Dir1_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir1_QTDLayout"); - - GroupDir1 = new QButtonGroup( this, "GroupDir1" ); - GroupDir1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDir1->sizePolicy().hasHeightForWidth() ) ); - GroupDir1->setTitle( trUtf8( "Direction" ) ); - GroupDir1->setColumnLayout(0, Qt::Vertical ); - GroupDir1->layout()->setSpacing( 6 ); - GroupDir1->layout()->setMargin( 11 ); - GroupDir1Layout = new QGridLayout( GroupDir1->layout() ); - GroupDir1Layout->setAlignment( Qt::AlignTop ); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - RB_Dir12 = new QRadioButton( GroupDir1, "RB_Dir12" ); - RB_Dir12->setText( trUtf8( "Perpendicular" ) ); - - Layout1->addWidget( RB_Dir12, 1, 0 ); - - RB_Dir13 = new QRadioButton( GroupDir1, "RB_Dir13" ); - RB_Dir13->setText( trUtf8( "Tangent" ) ); - - Layout1->addWidget( RB_Dir13, 2, 0 ); - - RB_Dir11 = new QRadioButton( GroupDir1, "RB_Dir11" ); - RB_Dir11->setText( trUtf8( "Angle" ) ); - - Layout1->addWidget( RB_Dir11, 0, 0 ); - - RB_Dir14 = new QRadioButton( GroupDir1, "RB_Dir14" ); - RB_Dir14->setText( trUtf8( "VX-VY" ) ); - - Layout1->addWidget( RB_Dir14, 3, 0 ); - - GroupDir1Layout->addLayout( Layout1, 0, 0 ); - - EntityGUI_Dir1_QTDLayout->addWidget( GroupDir1, 0, 0 ); - - // tab order - setTabOrder( RB_Dir11, RB_Dir12 ); - setTabOrder( RB_Dir12, RB_Dir13 ); - setTabOrder( RB_Dir13, RB_Dir14 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_Dir1_QTD::~EntityGUI_Dir1_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.h b/src/EntityGUI/EntityGUI_Dir1_QTD.h index 6ca2a1137..6231eca61 100644 --- a/src/EntityGUI/EntityGUI_Dir1_QTD.h +++ b/src/EntityGUI/EntityGUI_Dir1_QTD.h @@ -1,62 +1,114 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_Dir1_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_Dir1_QTD.ui' ** -** Created: ven déc 12 11:17:09 2003 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:20:45 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_DIR1_QTD_H #define ENTITYGUI_DIR1_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; -class QRadioButton; +class Ui_EntityGUI_Dir1_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupDir1; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QRadioButton *RB_Dir12; + QRadioButton *RB_Dir13; + QRadioButton *RB_Dir11; + QRadioButton *RB_Dir14; -class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir1_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_Dir1_QTD) + { + EntityGUI_Dir1_QTD->setObjectName(QString::fromUtf8("EntityGUI_Dir1_QTD")); + gridLayout = new QGridLayout(EntityGUI_Dir1_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupDir1 = new QGroupBox(EntityGUI_Dir1_QTD); + GroupDir1->setObjectName(QString::fromUtf8("GroupDir1")); + QSizePolicy sizePolicy(static_cast(7), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(GroupDir1->sizePolicy().hasHeightForWidth()); + GroupDir1->setSizePolicy(sizePolicy); + gridLayout1 = new QGridLayout(GroupDir1); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + RB_Dir12 = new QRadioButton(GroupDir1); + RB_Dir12->setObjectName(QString::fromUtf8("RB_Dir12")); -public: - EntityGUI_Dir1_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_Dir1_QTD(); + gridLayout2->addWidget(RB_Dir12, 1, 0, 1, 1); + + RB_Dir13 = new QRadioButton(GroupDir1); + RB_Dir13->setObjectName(QString::fromUtf8("RB_Dir13")); + + gridLayout2->addWidget(RB_Dir13, 2, 0, 1, 1); + + RB_Dir11 = new QRadioButton(GroupDir1); + RB_Dir11->setObjectName(QString::fromUtf8("RB_Dir11")); + + gridLayout2->addWidget(RB_Dir11, 0, 0, 1, 1); + + RB_Dir14 = new QRadioButton(GroupDir1); + RB_Dir14->setObjectName(QString::fromUtf8("RB_Dir14")); + + gridLayout2->addWidget(RB_Dir14, 3, 0, 1, 1); - QButtonGroup* GroupDir1; - QRadioButton* RB_Dir12; - QRadioButton* RB_Dir13; - QRadioButton* RB_Dir11; - QRadioButton* RB_Dir14; + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupDir1, 0, 0, 1, 1); + + QWidget::setTabOrder(RB_Dir11, RB_Dir12); + QWidget::setTabOrder(RB_Dir12, RB_Dir13); + QWidget::setTabOrder(RB_Dir13, RB_Dir14); + + retranslateUi(EntityGUI_Dir1_QTD); + + QSize size(131, 123); + size = size.expandedTo(EntityGUI_Dir1_QTD->minimumSizeHint()); + EntityGUI_Dir1_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_Dir1_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_Dir1_QTD) + { + EntityGUI_Dir1_QTD->setWindowTitle(QApplication::translate("EntityGUI_Dir1_QTD", "EntityGUI_Dir1_QTD", 0, QApplication::UnicodeUTF8)); + GroupDir1->setTitle(QApplication::translate("EntityGUI_Dir1_QTD", "Direction", 0, QApplication::UnicodeUTF8)); + RB_Dir12->setText(QApplication::translate("EntityGUI_Dir1_QTD", "Perpendicular", 0, QApplication::UnicodeUTF8)); + RB_Dir13->setText(QApplication::translate("EntityGUI_Dir1_QTD", "Tangent", 0, QApplication::UnicodeUTF8)); + RB_Dir11->setText(QApplication::translate("EntityGUI_Dir1_QTD", "Angle", 0, QApplication::UnicodeUTF8)); + RB_Dir14->setText(QApplication::translate("EntityGUI_Dir1_QTD", "VX-VY", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_Dir1_QTD); + } // retranslateUi -protected: - QGridLayout* EntityGUI_Dir1_QTDLayout; - QGridLayout* GroupDir1Layout; - QGridLayout* Layout1; }; +namespace Ui { + class EntityGUI_Dir1_QTD: public Ui_EntityGUI_Dir1_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_DIR1_QTD_H diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.cxx b/src/EntityGUI/EntityGUI_Dir2_QTD.cxx deleted file mode 100644 index bb509984b..000000000 --- a/src/EntityGUI/EntityGUI_Dir2_QTD.cxx +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_Dir2_QTD.ui' -** -** Created: ven déc 12 11:17:10 2003 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_Dir2_QTD.h" - -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_Dir2_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_Dir2_QTD::EntityGUI_Dir2_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_Dir2_QTD" ); - resize( 124, 106 ); - setCaption( trUtf8( "EntityGUI_Dir2_QTD" ) ); - EntityGUI_Dir2_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir2_QTDLayout"); - - GroupDir2 = new QButtonGroup( this, "GroupDir2" ); - GroupDir2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDir2->sizePolicy().hasHeightForWidth() ) ); - GroupDir2->setTitle( trUtf8( "Direction" ) ); - GroupDir2->setColumnLayout(0, Qt::Vertical ); - GroupDir2->layout()->setSpacing( 6 ); - GroupDir2->layout()->setMargin( 11 ); - GroupDir2Layout = new QGridLayout( GroupDir2->layout() ); - GroupDir2Layout->setAlignment( Qt::AlignTop ); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - RB_Dir22 = new QRadioButton( GroupDir2, "RB_Dir22" ); - RB_Dir22->setText( trUtf8( "X" ) ); - - Layout1->addWidget( RB_Dir22, 1, 0 ); - - RB_Dir23 = new QRadioButton( GroupDir2, "RB_Dir23" ); - RB_Dir23->setText( trUtf8( "Y" ) ); - - Layout1->addWidget( RB_Dir23, 2, 0 ); - QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); - Layout1->addItem( spacer, 3, 0 ); - - RB_Dir21 = new QRadioButton( GroupDir2, "RB_Dir21" ); - RB_Dir21->setText( trUtf8( "Length" ) ); - - Layout1->addWidget( RB_Dir21, 0, 0 ); - - GroupDir2Layout->addLayout( Layout1, 0, 0 ); - - EntityGUI_Dir2_QTDLayout->addWidget( GroupDir2, 0, 0 ); - - // tab order - setTabOrder( RB_Dir21, RB_Dir22 ); - setTabOrder( RB_Dir22, RB_Dir23 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_Dir2_QTD::~EntityGUI_Dir2_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.h b/src/EntityGUI/EntityGUI_Dir2_QTD.h index 17480e83f..5cffa22f8 100644 --- a/src/EntityGUI/EntityGUI_Dir2_QTD.h +++ b/src/EntityGUI/EntityGUI_Dir2_QTD.h @@ -1,61 +1,112 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_Dir2_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_Dir2_QTD.ui' ** -** Created: ven déc 12 11:17:09 2003 -** by: The User Interface Compiler (uic) +** Created: Tue Jul 10 10:24:41 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_DIR2_QTD_H #define ENTITYGUI_DIR2_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; -class QRadioButton; +class Ui_EntityGUI_Dir2_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupDir2; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QRadioButton *RB_Dir22; + QRadioButton *RB_Dir23; + QSpacerItem *spacerItem; + QRadioButton *RB_Dir21; -class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir2_QTD : public QWidget -{ - Q_OBJECT + void setupUi(QWidget *EntityGUI_Dir2_QTD) + { + EntityGUI_Dir2_QTD->setObjectName(QString::fromUtf8("EntityGUI_Dir2_QTD")); + gridLayout = new QGridLayout(EntityGUI_Dir2_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupDir2 = new QGroupBox(EntityGUI_Dir2_QTD); + GroupDir2->setObjectName(QString::fromUtf8("GroupDir2")); + QSizePolicy sizePolicy(static_cast(7), static_cast(7)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(GroupDir2->sizePolicy().hasHeightForWidth()); + GroupDir2->setSizePolicy(sizePolicy); + gridLayout1 = new QGridLayout(GroupDir2); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + RB_Dir22 = new QRadioButton(GroupDir2); + RB_Dir22->setObjectName(QString::fromUtf8("RB_Dir22")); -public: - EntityGUI_Dir2_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_Dir2_QTD(); + gridLayout2->addWidget(RB_Dir22, 1, 0, 1, 1); + + RB_Dir23 = new QRadioButton(GroupDir2); + RB_Dir23->setObjectName(QString::fromUtf8("RB_Dir23")); + + gridLayout2->addWidget(RB_Dir23, 2, 0, 1, 1); + + spacerItem = new QSpacerItem(0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout2->addItem(spacerItem, 3, 0, 1, 1); + + RB_Dir21 = new QRadioButton(GroupDir2); + RB_Dir21->setObjectName(QString::fromUtf8("RB_Dir21")); + + gridLayout2->addWidget(RB_Dir21, 0, 0, 1, 1); - QButtonGroup* GroupDir2; - QRadioButton* RB_Dir22; - QRadioButton* RB_Dir23; - QRadioButton* RB_Dir21; + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); + + + gridLayout->addWidget(GroupDir2, 0, 0, 1, 1); + + QWidget::setTabOrder(RB_Dir21, RB_Dir22); + QWidget::setTabOrder(RB_Dir22, RB_Dir23); + + retranslateUi(EntityGUI_Dir2_QTD); + + QSize size(124, 106); + size = size.expandedTo(EntityGUI_Dir2_QTD->minimumSizeHint()); + EntityGUI_Dir2_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_Dir2_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_Dir2_QTD) + { + EntityGUI_Dir2_QTD->setWindowTitle(QApplication::translate("EntityGUI_Dir2_QTD", "EntityGUI_Dir2_QTD", 0, QApplication::UnicodeUTF8)); + GroupDir2->setTitle(QApplication::translate("EntityGUI_Dir2_QTD", "Direction", 0, QApplication::UnicodeUTF8)); + RB_Dir22->setText(QApplication::translate("EntityGUI_Dir2_QTD", "X", 0, QApplication::UnicodeUTF8)); + RB_Dir23->setText(QApplication::translate("EntityGUI_Dir2_QTD", "Y", 0, QApplication::UnicodeUTF8)); + RB_Dir21->setText(QApplication::translate("EntityGUI_Dir2_QTD", "Length", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_Dir2_QTD); + } // retranslateUi -protected: - QGridLayout* EntityGUI_Dir2_QTDLayout; - QGridLayout* GroupDir2Layout; - QGridLayout* Layout1; }; +namespace Ui { + class EntityGUI_Dir2_QTD: public Ui_EntityGUI_Dir2_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_DIR2_QTD_H diff --git a/src/EntityGUI/EntityGUI_Point_QTD.cxx b/src/EntityGUI/EntityGUI_Point_QTD.cxx deleted file mode 100644 index bc2a482fd..000000000 --- a/src/EntityGUI/EntityGUI_Point_QTD.cxx +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_Point_QTD.ui' -** -** Created: ven déc 12 11:17:08 2003 -** by: The User Interface Compiler (uic) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ -#include "EntityGUI_Point_QTD.h" - -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_Point_QTD which is a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -EntityGUI_Point_QTD::EntityGUI_Point_QTD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "EntityGUI_Point_QTD" ); - resize( 124, 106 ); - setCaption( trUtf8( "EntityGUI_Point_QTD" ) ); - EntityGUI_Point_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Point_QTDLayout"); - - GroupPoint = new QButtonGroup( this, "GroupPoint" ); - GroupPoint->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupPoint->sizePolicy().hasHeightForWidth() ) ); - GroupPoint->setTitle( trUtf8( "Point" ) ); - GroupPoint->setColumnLayout(0, Qt::Vertical ); - GroupPoint->layout()->setSpacing( 6 ); - GroupPoint->layout()->setMargin( 11 ); - GroupPointLayout = new QGridLayout( GroupPoint->layout() ); - GroupPointLayout->setAlignment( Qt::AlignTop ); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - RB_Point2 = new QRadioButton( GroupPoint, "RB_Point2" ); - RB_Point2->setText( trUtf8( "Relative" ) ); - - Layout1->addWidget( RB_Point2, 1, 0 ); - - RB_Point1 = new QRadioButton( GroupPoint, "RB_Point1" ); - RB_Point1->setText( trUtf8( "Absolute" ) ); - - Layout1->addWidget( RB_Point1, 0, 0 ); - - RB_Point3 = new QRadioButton( GroupPoint, "RB_Point3" ); - RB_Point3->setText( trUtf8( "Selection" ) ); - - Layout1->addWidget( RB_Point3, 2, 0 ); - - GroupPointLayout->addLayout( Layout1, 0, 0 ); - - EntityGUI_Point_QTDLayout->addWidget( GroupPoint, 0, 0 ); - - // tab order - setTabOrder( RB_Point1, RB_Point2 ); - setTabOrder( RB_Point2, RB_Point3 ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_Point_QTD::~EntityGUI_Point_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - diff --git a/src/EntityGUI/EntityGUI_Point_QTD.h b/src/EntityGUI/EntityGUI_Point_QTD.h index 453b09807..897833f5e 100644 --- a/src/EntityGUI/EntityGUI_Point_QTD.h +++ b/src/EntityGUI/EntityGUI_Point_QTD.h @@ -1,61 +1,106 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_Point_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_Point_QTD.ui' ** -** Created: ven déc 12 11:17:08 2003 -** by: The User Interface Compiler (uic) +** Created: Mon Jul 9 17:24:53 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ + #ifndef ENTITYGUI_POINT_QTD_H #define ENTITYGUI_POINT_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class Ui_EntityGUI_Point_QTD +{ +public: + QGridLayout *gridLayout; + QGroupBox *GroupPoint; + QGridLayout *gridLayout1; + QGridLayout *gridLayout2; + QRadioButton *RB_Point2; + QRadioButton *RB_Point1; + QRadioButton *RB_Point3; -#include -#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; -class QRadioButton; + void setupUi(QWidget *EntityGUI_Point_QTD) + { + EntityGUI_Point_QTD->setObjectName(QString::fromUtf8("EntityGUI_Point_QTD")); + gridLayout = new QGridLayout(EntityGUI_Point_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(0); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GroupPoint = new QGroupBox(EntityGUI_Point_QTD); + GroupPoint->setObjectName(QString::fromUtf8("GroupPoint")); + QSizePolicy sizePolicy(static_cast(7), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(GroupPoint->sizePolicy().hasHeightForWidth()); + GroupPoint->setSizePolicy(sizePolicy); + gridLayout1 = new QGridLayout(GroupPoint); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(11); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2 = new QGridLayout(); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + RB_Point2 = new QRadioButton(GroupPoint); + RB_Point2->setObjectName(QString::fromUtf8("RB_Point2")); -class GEOM_ENTITYGUI_EXPORT EntityGUI_Point_QTD : public QWidget -{ - Q_OBJECT + gridLayout2->addWidget(RB_Point2, 1, 0, 1, 1); + + RB_Point1 = new QRadioButton(GroupPoint); + RB_Point1->setObjectName(QString::fromUtf8("RB_Point1")); + + gridLayout2->addWidget(RB_Point1, 0, 0, 1, 1); + + RB_Point3 = new QRadioButton(GroupPoint); + RB_Point3->setObjectName(QString::fromUtf8("RB_Point3")); + + gridLayout2->addWidget(RB_Point3, 2, 0, 1, 1); -public: - EntityGUI_Point_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~EntityGUI_Point_QTD(); - QButtonGroup* GroupPoint; - QRadioButton* RB_Point2; - QRadioButton* RB_Point1; - QRadioButton* RB_Point3; + gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1); -protected: - QGridLayout* EntityGUI_Point_QTDLayout; - QGridLayout* GroupPointLayout; - QGridLayout* Layout1; + gridLayout->addWidget(GroupPoint, 0, 0, 1, 1); + + QWidget::setTabOrder(RB_Point1, RB_Point2); + QWidget::setTabOrder(RB_Point2, RB_Point3); + + retranslateUi(EntityGUI_Point_QTD); + + QSize size(124, 106); + size = size.expandedTo(EntityGUI_Point_QTD->minimumSizeHint()); + EntityGUI_Point_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_Point_QTD); + } // setupUi + + void retranslateUi(QWidget *EntityGUI_Point_QTD) + { + EntityGUI_Point_QTD->setWindowTitle(QApplication::translate("EntityGUI_Point_QTD", "EntityGUI_Point_QTD", 0, QApplication::UnicodeUTF8)); + GroupPoint->setTitle(QApplication::translate("EntityGUI_Point_QTD", "Point", 0, QApplication::UnicodeUTF8)); + RB_Point2->setText(QApplication::translate("EntityGUI_Point_QTD", "Relative", 0, QApplication::UnicodeUTF8)); + RB_Point1->setText(QApplication::translate("EntityGUI_Point_QTD", "Absolute", 0, QApplication::UnicodeUTF8)); + RB_Point3->setText(QApplication::translate("EntityGUI_Point_QTD", "Selection", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_Point_QTD); + } // retranslateUi + }; +namespace Ui { + class EntityGUI_Point_QTD: public Ui_EntityGUI_Point_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_POINT_QTD_H diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx deleted file mode 100644 index 863f45fe9..000000000 --- a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx +++ /dev/null @@ -1,210 +0,0 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' -** -** Created: Fri Mar 17 15:47:14 2006 -** by: The User Interface Compiler ($Id$) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - -#include "EntityGUI_Skeleton_QTD.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a EntityGUI_Skeleton_QTD as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - * - * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. - */ -EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) -{ - if ( !name ) - setName( "EntityGUI_Skeleton_QTD" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - EntityGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "EntityGUI_Skeleton_QTDLayout"); - - Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); - - GroupVal = new QGroupBox( this, "GroupVal" ); - GroupVal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupVal->sizePolicy().hasHeightForWidth() ) ); - - Layout1->addWidget( GroupVal, 2, 0 ); - - GroupConstructors = new QButtonGroup( this, "GroupConstructors" ); - GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) ); - GroupConstructors->setColumnLayout(0, Qt::Vertical ); - GroupConstructors->layout()->setSpacing( 6 ); - GroupConstructors->layout()->setMargin( 11 ); - GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() ); - GroupConstructorsLayout->setAlignment( Qt::AlignTop ); - - Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); - - RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" ); - Layout2->addWidget( RadioButton1 ); - - RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" ); - Layout2->addWidget( RadioButton2 ); - - GroupConstructorsLayout->addLayout( Layout2, 0, 0 ); - - Layout1->addWidget( GroupConstructors, 0, 0 ); - - GroupDest = new QGroupBox( this, "GroupDest" ); - GroupDest->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest->sizePolicy().hasHeightForWidth() ) ); - GroupDest->setColumnLayout(0, Qt::Vertical ); - GroupDest->layout()->setSpacing( 6 ); - GroupDest->layout()->setMargin( 11 ); - GroupDestLayout = new QGridLayout( GroupDest->layout() ); - GroupDestLayout->setAlignment( Qt::AlignTop ); - - Layout5 = new QGridLayout( 0, 1, 1, 0, 6, "Layout5"); - - GroupDest1 = new QButtonGroup( GroupDest, "GroupDest1" ); - GroupDest1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest1->sizePolicy().hasHeightForWidth() ) ); - GroupDest1->setColumnLayout(0, Qt::Vertical ); - GroupDest1->layout()->setSpacing( 6 ); - GroupDest1->layout()->setMargin( 11 ); - GroupDest1Layout = new QGridLayout( GroupDest1->layout() ); - GroupDest1Layout->setAlignment( Qt::AlignTop ); - - Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); - - RB_Dest2 = new QRadioButton( GroupDest1, "RB_Dest2" ); - - Layout4->addWidget( RB_Dest2, 0, 1 ); - - RB_Dest1 = new QRadioButton( GroupDest1, "RB_Dest1" ); - - Layout4->addWidget( RB_Dest1, 0, 0 ); - - GroupDest1Layout->addLayout( Layout4, 0, 0 ); - - Layout5->addMultiCellWidget( GroupDest1, 0, 0, 0, 1 ); - - GroupDest2 = new QButtonGroup( GroupDest, "GroupDest2" ); - GroupDest2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest2->sizePolicy().hasHeightForWidth() ) ); - GroupDest2->setColumnLayout(0, Qt::Vertical ); - GroupDest2->layout()->setSpacing( 6 ); - GroupDest2->layout()->setMargin( 11 ); - GroupDest2Layout = new QGridLayout( GroupDest2->layout() ); - GroupDest2Layout->setAlignment( Qt::AlignTop ); - - Layout5->addWidget( GroupDest2, 1, 0 ); - - GroupDest3 = new QButtonGroup( GroupDest, "GroupDest3" ); - GroupDest3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest3->sizePolicy().hasHeightForWidth() ) ); - GroupDest3->setColumnLayout(0, Qt::Vertical ); - GroupDest3->layout()->setSpacing( 6 ); - GroupDest3->layout()->setMargin( 11 ); - GroupDest3Layout = new QGridLayout( GroupDest3->layout() ); - GroupDest3Layout->setAlignment( Qt::AlignTop ); - - Layout5->addWidget( GroupDest3, 1, 1 ); - - GroupDestLayout->addLayout( Layout5, 0, 0 ); - - Layout1->addWidget( GroupDest, 1, 0 ); - - GroupButtons = new QGroupBox( this, "GroupButtons" ); - GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) ); - GroupButtons->setColumnLayout(0, Qt::Vertical ); - GroupButtons->layout()->setSpacing( 6 ); - GroupButtons->layout()->setMargin( 11 ); - GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() ); - GroupButtonsLayout->setAlignment( Qt::AlignTop ); - - Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); - - buttonEnd = new QPushButton( GroupButtons, "buttonEnd" ); - Layout3->addWidget( buttonEnd ); - - buttonClose = new QPushButton( GroupButtons, "buttonClose" ); - Layout3->addWidget( buttonClose ); - Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout3->addItem( Spacer1 ); - - buttonCancel = new QPushButton( GroupButtons, "buttonCancel" ); - Layout3->addWidget( buttonCancel ); - - buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); - Layout3->addWidget( buttonHelp ); - GroupButtonsLayout->addLayout( Layout3 ); - - Layout1->addWidget( GroupButtons, 3, 0 ); - - EntityGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 ); - languageChange(); - resize( QSize(317, 276).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); - - // tab order - setTabOrder( RadioButton1, RadioButton2 ); - setTabOrder( RadioButton2, RB_Dest1 ); - setTabOrder( RB_Dest1, RB_Dest2 ); - setTabOrder( RB_Dest2, buttonEnd ); - setTabOrder( buttonEnd, buttonClose ); - setTabOrder( buttonClose, buttonCancel ); -} - -/* - * Destroys the object and frees any allocated resources - */ -EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD() -{ - // no need to delete child widgets, Qt does it all for us -} - -/* - * Sets the strings of the subwidgets using the current - * language. - */ -void EntityGUI_Skeleton_QTD::languageChange() -{ - setCaption( tr( "EntityGUI_Skeleton_QTD" ) ); - GroupVal->setTitle( QString::null ); - GroupConstructors->setTitle( tr( "Element Type" ) ); - RadioButton1->setText( tr( "Segment" ) ); - RadioButton2->setText( tr( "Arc" ) ); - GroupDest->setTitle( tr( "Destination" ) ); - GroupDest1->setTitle( tr( "Type" ) ); - RB_Dest2->setText( tr( "Direction" ) ); - RB_Dest1->setText( tr( "Point" ) ); - GroupDest2->setTitle( QString::null ); - GroupDest3->setTitle( QString::null ); - GroupButtons->setTitle( QString::null ); - buttonEnd->setText( tr( "End Sketch" ) ); - buttonClose->setText( tr( "Close Sketch" ) ); - buttonCancel->setText( tr( "&Cancel" ) ); - buttonHelp->setText( tr( "&Help" ) ); -} - diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.h b/src/EntityGUI/EntityGUI_Skeleton_QTD.h index 70468d719..ee39349c4 100644 --- a/src/EntityGUI/EntityGUI_Skeleton_QTD.h +++ b/src/EntityGUI/EntityGUI_Skeleton_QTD.h @@ -1,90 +1,287 @@ -// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -/**************************************************************************** -** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' +/******************************************************************************** +** Form generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' ** -** Created: Fri Mar 17 15:47:13 2006 -** by: The User Interface Compiler ($Id$) +** Created: Mon Jul 9 17:21:08 2007 +** by: Qt User Interface Compiler version 4.2.3 ** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ +** WARNING! All changes made in this file will be lost when recompiling ui file! +********************************************************************************/ #ifndef ENTITYGUI_SKELETON_QTD_H #define ENTITYGUI_SKELETON_QTD_H -#include "GEOM_EntityGUI.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +class Ui_EntityGUI_Skeleton_QTD +{ +public: + QGridLayout *gridLayout; + QGridLayout *gridLayout1; + QGroupBox *GroupVal; + QGroupBox *GroupConstructors; + QGridLayout *gridLayout2; + QHBoxLayout *hboxLayout; + QRadioButton *RadioButton1; + QRadioButton *RadioButton2; + QGroupBox *GroupDest; + QGridLayout *gridLayout3; + QGridLayout *gridLayout4; + QGroupBox *GroupDest1; + QGridLayout *gridLayout5; + QGridLayout *gridLayout6; + QRadioButton *RB_Dest2; + QRadioButton *RB_Dest1; + QGroupBox *GroupDest2; + QGridLayout *gridLayout7; + QGroupBox *GroupDest3; + QGridLayout *gridLayout8; + QGroupBox *GroupButtons; + QHBoxLayout *hboxLayout1; + QHBoxLayout *hboxLayout2; + QPushButton *buttonEnd; + QPushButton *buttonClose; + QSpacerItem *spacerItem; + QPushButton *buttonCancel; + QPushButton *buttonHelp; -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QGroupBox; -class QButtonGroup; -class QRadioButton; -class QPushButton; + void setupUi(QDialog *EntityGUI_Skeleton_QTD) + { + EntityGUI_Skeleton_QTD->setObjectName(QString::fromUtf8("EntityGUI_Skeleton_QTD")); + QSizePolicy sizePolicy(static_cast(5), static_cast(7)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(EntityGUI_Skeleton_QTD->sizePolicy().hasHeightForWidth()); + EntityGUI_Skeleton_QTD->setSizePolicy(sizePolicy); + gridLayout = new QGridLayout(EntityGUI_Skeleton_QTD); + gridLayout->setSpacing(6); + gridLayout->setMargin(11); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + gridLayout1 = new QGridLayout(); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(0); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + GroupVal = new QGroupBox(EntityGUI_Skeleton_QTD); + GroupVal->setObjectName(QString::fromUtf8("GroupVal")); + QSizePolicy sizePolicy1(static_cast(7), static_cast(7)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(GroupVal->sizePolicy().hasHeightForWidth()); + GroupVal->setSizePolicy(sizePolicy1); -class GEOM_ENTITYGUI_EXPORT EntityGUI_Skeleton_QTD : public QDialog -{ - Q_OBJECT + gridLayout1->addWidget(GroupVal, 2, 0, 1, 1); -public: - EntityGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); - ~EntityGUI_Skeleton_QTD(); - - QGroupBox* GroupVal; - QButtonGroup* GroupConstructors; - QRadioButton* RadioButton1; - QRadioButton* RadioButton2; - QGroupBox* GroupDest; - QButtonGroup* GroupDest1; - QRadioButton* RB_Dest2; - QRadioButton* RB_Dest1; - QButtonGroup* GroupDest2; - QButtonGroup* GroupDest3; - QGroupBox* GroupButtons; - QPushButton* buttonEnd; - QPushButton* buttonClose; - QPushButton* buttonCancel; - QPushButton* buttonHelp; - -protected: - QGridLayout* EntityGUI_Skeleton_QTDLayout; - QGridLayout* Layout1; - QGridLayout* GroupConstructorsLayout; - QHBoxLayout* Layout2; - QGridLayout* GroupDestLayout; - QGridLayout* Layout5; - QGridLayout* GroupDest1Layout; - QGridLayout* Layout4; - QGridLayout* GroupDest2Layout; - QGridLayout* GroupDest3Layout; - QHBoxLayout* GroupButtonsLayout; - QHBoxLayout* Layout3; - QSpacerItem* Spacer1; - -protected slots: - virtual void languageChange(); + GroupConstructors = new QGroupBox(EntityGUI_Skeleton_QTD); + GroupConstructors->setObjectName(QString::fromUtf8("GroupConstructors")); + QSizePolicy sizePolicy2(static_cast(5), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(GroupConstructors->sizePolicy().hasHeightForWidth()); + GroupConstructors->setSizePolicy(sizePolicy2); + gridLayout2 = new QGridLayout(GroupConstructors); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(11); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + hboxLayout = new QHBoxLayout(); + hboxLayout->setSpacing(6); + hboxLayout->setMargin(0); + hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); + RadioButton1 = new QRadioButton(GroupConstructors); + RadioButton1->setObjectName(QString::fromUtf8("RadioButton1")); + + hboxLayout->addWidget(RadioButton1); + + RadioButton2 = new QRadioButton(GroupConstructors); + RadioButton2->setObjectName(QString::fromUtf8("RadioButton2")); + + hboxLayout->addWidget(RadioButton2); + + + gridLayout2->addLayout(hboxLayout, 0, 0, 1, 1); + + + gridLayout1->addWidget(GroupConstructors, 0, 0, 1, 1); + + GroupDest = new QGroupBox(EntityGUI_Skeleton_QTD); + GroupDest->setObjectName(QString::fromUtf8("GroupDest")); + QSizePolicy sizePolicy3(static_cast(7), static_cast(0)); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(GroupDest->sizePolicy().hasHeightForWidth()); + GroupDest->setSizePolicy(sizePolicy3); + gridLayout3 = new QGridLayout(GroupDest); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(11); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + gridLayout4 = new QGridLayout(); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(0); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + GroupDest1 = new QGroupBox(GroupDest); + GroupDest1->setObjectName(QString::fromUtf8("GroupDest1")); + QSizePolicy sizePolicy4(static_cast(7), static_cast(0)); + sizePolicy4.setHorizontalStretch(0); + sizePolicy4.setVerticalStretch(0); + sizePolicy4.setHeightForWidth(GroupDest1->sizePolicy().hasHeightForWidth()); + GroupDest1->setSizePolicy(sizePolicy4); + gridLayout5 = new QGridLayout(GroupDest1); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(11); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); + gridLayout6 = new QGridLayout(); + gridLayout6->setSpacing(6); + gridLayout6->setMargin(0); + gridLayout6->setObjectName(QString::fromUtf8("gridLayout6")); + RB_Dest2 = new QRadioButton(GroupDest1); + RB_Dest2->setObjectName(QString::fromUtf8("RB_Dest2")); + + gridLayout6->addWidget(RB_Dest2, 0, 1, 1, 1); + + RB_Dest1 = new QRadioButton(GroupDest1); + RB_Dest1->setObjectName(QString::fromUtf8("RB_Dest1")); + + gridLayout6->addWidget(RB_Dest1, 0, 0, 1, 1); + + + gridLayout5->addLayout(gridLayout6, 0, 0, 1, 1); + + + gridLayout4->addWidget(GroupDest1, 0, 0, 1, 2); + + GroupDest2 = new QGroupBox(GroupDest); + GroupDest2->setObjectName(QString::fromUtf8("GroupDest2")); + QSizePolicy sizePolicy5(static_cast(7), static_cast(7)); + sizePolicy5.setHorizontalStretch(0); + sizePolicy5.setVerticalStretch(0); + sizePolicy5.setHeightForWidth(GroupDest2->sizePolicy().hasHeightForWidth()); + GroupDest2->setSizePolicy(sizePolicy5); + gridLayout7 = new QGridLayout(GroupDest2); + gridLayout7->setSpacing(6); + gridLayout7->setMargin(11); + gridLayout7->setObjectName(QString::fromUtf8("gridLayout7")); + + gridLayout4->addWidget(GroupDest2, 1, 0, 1, 1); + + GroupDest3 = new QGroupBox(GroupDest); + GroupDest3->setObjectName(QString::fromUtf8("GroupDest3")); + QSizePolicy sizePolicy6(static_cast(7), static_cast(7)); + sizePolicy6.setHorizontalStretch(0); + sizePolicy6.setVerticalStretch(0); + sizePolicy6.setHeightForWidth(GroupDest3->sizePolicy().hasHeightForWidth()); + GroupDest3->setSizePolicy(sizePolicy6); + gridLayout8 = new QGridLayout(GroupDest3); + gridLayout8->setSpacing(6); + gridLayout8->setMargin(11); + gridLayout8->setObjectName(QString::fromUtf8("gridLayout8")); + + gridLayout4->addWidget(GroupDest3, 1, 1, 1, 1); + + + gridLayout3->addLayout(gridLayout4, 0, 0, 1, 1); + + + gridLayout1->addWidget(GroupDest, 1, 0, 1, 1); + + GroupButtons = new QGroupBox(EntityGUI_Skeleton_QTD); + GroupButtons->setObjectName(QString::fromUtf8("GroupButtons")); + QSizePolicy sizePolicy7(static_cast(7), static_cast(0)); + sizePolicy7.setHorizontalStretch(0); + sizePolicy7.setVerticalStretch(0); + sizePolicy7.setHeightForWidth(GroupButtons->sizePolicy().hasHeightForWidth()); + GroupButtons->setSizePolicy(sizePolicy7); + hboxLayout1 = new QHBoxLayout(GroupButtons); + hboxLayout1->setSpacing(6); + hboxLayout1->setMargin(11); + hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); + hboxLayout2 = new QHBoxLayout(); + hboxLayout2->setSpacing(6); + hboxLayout2->setMargin(0); + hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2")); + buttonEnd = new QPushButton(GroupButtons); + buttonEnd->setObjectName(QString::fromUtf8("buttonEnd")); + + hboxLayout2->addWidget(buttonEnd); + + buttonClose = new QPushButton(GroupButtons); + buttonClose->setObjectName(QString::fromUtf8("buttonClose")); + + hboxLayout2->addWidget(buttonClose); + + spacerItem = new QSpacerItem(91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); + + hboxLayout2->addItem(spacerItem); + + buttonCancel = new QPushButton(GroupButtons); + buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); + + hboxLayout2->addWidget(buttonCancel); + + buttonHelp = new QPushButton(GroupButtons); + buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); + + hboxLayout2->addWidget(buttonHelp); + + + hboxLayout1->addLayout(hboxLayout2); + + + gridLayout1->addWidget(GroupButtons, 3, 0, 1, 1); + + + gridLayout->addLayout(gridLayout1, 0, 0, 1, 1); + + QWidget::setTabOrder(RadioButton1, RadioButton2); + QWidget::setTabOrder(RadioButton2, RB_Dest1); + QWidget::setTabOrder(RB_Dest1, RB_Dest2); + QWidget::setTabOrder(RB_Dest2, buttonEnd); + QWidget::setTabOrder(buttonEnd, buttonClose); + QWidget::setTabOrder(buttonClose, buttonCancel); + + retranslateUi(EntityGUI_Skeleton_QTD); + + QSize size(317, 276); + size = size.expandedTo(EntityGUI_Skeleton_QTD->minimumSizeHint()); + EntityGUI_Skeleton_QTD->resize(size); + + + QMetaObject::connectSlotsByName(EntityGUI_Skeleton_QTD); + } // setupUi + + void retranslateUi(QDialog *EntityGUI_Skeleton_QTD) + { + EntityGUI_Skeleton_QTD->setWindowTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "EntityGUI_Skeleton_QTD", 0, QApplication::UnicodeUTF8)); + GroupVal->setTitle(QString()); + GroupConstructors->setTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "Element Type", 0, QApplication::UnicodeUTF8)); + RadioButton1->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Segment", 0, QApplication::UnicodeUTF8)); + RadioButton2->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Arc", 0, QApplication::UnicodeUTF8)); + GroupDest->setTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "Destination", 0, QApplication::UnicodeUTF8)); + GroupDest1->setTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "Type", 0, QApplication::UnicodeUTF8)); + RB_Dest2->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Direction", 0, QApplication::UnicodeUTF8)); + RB_Dest1->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Point", 0, QApplication::UnicodeUTF8)); + GroupDest2->setTitle(QString()); + GroupDest3->setTitle(QString()); + GroupButtons->setTitle(QString()); + buttonEnd->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "End Sketch", 0, QApplication::UnicodeUTF8)); + buttonClose->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Close Sketch", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "&Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "&Help", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(EntityGUI_Skeleton_QTD); + } // retranslateUi }; +namespace Ui { + class EntityGUI_Skeleton_QTD: public Ui_EntityGUI_Skeleton_QTD {}; +} // namespace Ui + #endif // ENTITYGUI_SKELETON_QTD_H diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 5a3baf23f..b9f1a82e6 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -28,9 +28,17 @@ #include "EntityGUI_SketcherDlg.h" #include "Sketcher_Profile.hxx" -#include "GEOM_Displayer.h" #include "GEOMBase.h" +#include "EntityGUI_1Spin.h" +#include "EntityGUI_2Spin.h" +#include "EntityGUI_3Spin.h" +#include "EntityGUI_4Spin.h" + +#include "DlgRef_SpinBox.h" + +#include "GeometryGUI.h" + #include "SUIT_Desktop.h" #include "SUIT_Session.h" #include "SUIT_MessageBox.h" @@ -39,8 +47,7 @@ #include "LightApp_Application.h" #include "LightApp_SelectionMgr.h" -#include -#include +#include #include #include @@ -52,8 +59,6 @@ #include "GEOMImpl_Types.hxx" -#include "utilities.h" - using namespace std; //================================================================================= @@ -64,33 +69,43 @@ using namespace std; // TRUE to construct a modal dialog. //================================================================================= EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, - const char* name, bool modal, WFlags fl, + const char* name, bool modal, Qt::WindowFlags fl, const double lineWidth) - :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize | - WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), + :QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), myIsAllAdded( false ), GEOMBase_Helper( dynamic_cast( parent ) ), myGeometryGUI( GUI ), myLineWidth( lineWidth ) { + setupUi(this); + + setModal( modal ); + setAttribute( Qt::WA_DeleteOnClose ); + myGeometryGUI->SetActiveDialogBox(this); - if ( !name ) setName("EntityGUI_SketcherDlg"); + if ( !name ) + setObjectName("EntityGUI_SketcherDlg"); + else + setObjectName(name); buttonCancel->setText(tr("GEOM_BUT_CANCEL")); buttonEnd->setText(tr("GEOM_BUT_END_SKETCH")); buttonClose->setText(tr("GEOM_BUT_CLOSE_SKETCH")); buttonHelp->setText(tr("GEOM_BUT_HELP")); - GroupVal->close(TRUE); - GroupDest2->close(TRUE); - GroupDest3->close(TRUE); + GroupVal->setAttribute( Qt::WA_DeleteOnClose ); + GroupVal->close(); + GroupDest2->setAttribute( Qt::WA_DeleteOnClose ); + GroupDest2->close(); + GroupDest3->setAttribute( Qt::WA_DeleteOnClose ); + GroupDest3->close(); QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_UNDO"))); QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REDO"))); - setCaption(tr("GEOM_SKETCHER_TITLE")); + setWindowTitle(tr("GEOM_SKETCHER_TITLE")); GroupConstructors->setTitle(tr("GEOM_SKETCHER_EL")); RadioButton1->setText(tr("GEOM_SKETCHER_SEGMENT")); @@ -101,39 +116,55 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, RB_Dest2->setText(tr("GEOM_SKETCHER_DIR")); /***************************************************************/ - GroupPt = new EntityGUI_Point_QTD(GroupDest, "GroupPt"); + GroupPt = new Ui::EntityGUI_Point_QTD(); + QWidget* aGroupPtWidget = new QWidget(GroupDest); + GroupPt->setupUi(aGroupPtWidget); + aGroupPtWidget->setObjectName("GroupPt"); + GroupPt->GroupPoint->setTitle(tr("GEOM_SKETCHER_POINT")); GroupPt->RB_Point1->setText(tr("GEOM_SKETCHER_ABS")); GroupPt->RB_Point2->setText(tr("GEOM_SKETCHER_REL")); GroupPt->RB_Point3->setText(tr("GEOM_SKETCHER_SEL")); - GroupD1 = new EntityGUI_Dir1_QTD(GroupDest, "GroupD1"); + GroupD1 = new Ui::EntityGUI_Dir1_QTD(); + QWidget* aGroupD1Widget = new QWidget(GroupDest); + GroupD1->setupUi(aGroupD1Widget); + aGroupD1Widget->setObjectName("GroupD1"); + GroupD1->GroupDir1->setTitle(tr("GEOM_SKETCHER_DIR")); GroupD1->RB_Dir11->setText(tr("GEOM_SKETCHER_ANGLE")); GroupD1->RB_Dir12->setText(tr("GEOM_SKETCHER_PER")); GroupD1->RB_Dir13->setText(tr("GEOM_SKETCHER_TAN")); GroupD1->RB_Dir14->setText(tr("GEOM_SKETCHER_VXVY")); - GroupD2 = new EntityGUI_Dir2_QTD(GroupDest, "GroupD2"); + GroupD2 = new Ui::EntityGUI_Dir2_QTD(); + QWidget* aGroupD2Widget = new QWidget(GroupDest); + GroupD2->setupUi(aGroupD2Widget); + aGroupD2Widget->setObjectName("GroupD2"); + GroupD2->GroupDir2->setTitle(tr("GEOM_SKETCHER_DIR")); GroupD2->RB_Dir21->setText(tr("GEOM_SKETCHER_LENGTH")); GroupD2->RB_Dir22->setText(tr("GEOM_SKETCHER_X")); GroupD2->RB_Dir23->setText(tr("GEOM_SKETCHER_Y")); - Group1Sel = new EntityGUI_1Sel_QTD(this, "Group1Sel"); + Group1Sel = new Ui::EntityGUI_1Sel_QTD(); + QWidget* aGroup1SelWidget = new QWidget(this); + Group1Sel->setupUi(aGroup1SelWidget); + aGroup1SelWidget->setObjectName("Group1Sel"); + Group1Sel->TextLabel1->setText(tr("GEOM_SKETCHER_POINT2")); Group1Sel->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES")); Group1Sel->buttonApply->setText(tr("GEOM_SKETCHER_APPLY")); - Group1Sel->PushButton1->setPixmap(image0); - Group1Sel->buttonUndo->setPixmap(image1); - Group1Sel->buttonRedo->setPixmap(image2); + Group1Sel->PushButton1->setIcon(image0); + Group1Sel->buttonUndo->setIcon(image1); + Group1Sel->buttonRedo->setIcon(image2); Group1Sel->LineEdit1->setReadOnly( true ); Group1Spin = new EntityGUI_1Spin(this, "Group1Spin"); Group1Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES")); Group1Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY")); - Group1Spin->buttonUndo->setPixmap(image1); - Group1Spin->buttonRedo->setPixmap(image2); + Group1Spin->buttonUndo->setIcon(image1); + Group1Spin->buttonRedo->setIcon(image2); QWidget::setTabOrder(Group1Spin->SpinBox_DX , Group1Spin->buttonApply); QWidget::setTabOrder(Group1Spin->buttonApply, Group1Spin->buttonUndo); QWidget::setTabOrder(Group1Spin->buttonUndo , Group1Spin->buttonRedo); @@ -141,8 +172,8 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, Group2Spin = new EntityGUI_2Spin(this, "Group2Spin"); Group2Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES")); Group2Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY")); - Group2Spin->buttonUndo->setPixmap(image1); - Group2Spin->buttonRedo->setPixmap(image2); + Group2Spin->buttonUndo->setIcon(image1); + Group2Spin->buttonRedo->setIcon(image2); QWidget::setTabOrder(Group2Spin->SpinBox_DX , Group2Spin->SpinBox_DY); QWidget::setTabOrder(Group2Spin->SpinBox_DY , Group2Spin->buttonApply); QWidget::setTabOrder(Group2Spin->buttonApply, Group2Spin->buttonUndo); @@ -151,8 +182,8 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, Group3Spin = new EntityGUI_3Spin(this, "Group3Spin"); Group3Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES")); Group3Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY")); - Group3Spin->buttonUndo->setPixmap(image1); - Group3Spin->buttonRedo->setPixmap(image2); + Group3Spin->buttonUndo->setIcon(image1); + Group3Spin->buttonRedo->setIcon(image2); QWidget::setTabOrder(Group3Spin->SpinBox_DX , Group3Spin->SpinBox_DY); QWidget::setTabOrder(Group3Spin->SpinBox_DY , Group3Spin->SpinBox_DZ); QWidget::setTabOrder(Group3Spin->SpinBox_DZ , Group3Spin->buttonApply); @@ -162,8 +193,8 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, Group4Spin = new EntityGUI_4Spin(this, "Group4Spin"); Group4Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES")); Group4Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY")); - Group4Spin->buttonUndo->setPixmap(image1); - Group4Spin->buttonRedo->setPixmap(image2); + Group4Spin->buttonUndo->setIcon(image1); + Group4Spin->buttonRedo->setIcon(image2); QWidget::setTabOrder(Group4Spin->SpinBox_DX , Group4Spin->SpinBox_DY); QWidget::setTabOrder(Group4Spin->SpinBox_DY , Group4Spin->SpinBox_DZ); QWidget::setTabOrder(Group4Spin->SpinBox_DZ , Group4Spin->SpinBox_DS); @@ -171,15 +202,15 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, QWidget::setTabOrder(Group4Spin->buttonApply, Group4Spin->buttonUndo); QWidget::setTabOrder(Group4Spin->buttonUndo , Group4Spin->buttonRedo); - Layout5->addMultiCellWidget(GroupPt, 1, 1, 0, 1); - Layout5->addWidget(GroupD1, 1, 0); - Layout5->addWidget(GroupD2, 1, 1); + gridLayout4->addWidget(aGroupPtWidget, 1, 0, 1, 2); + gridLayout4->addWidget(aGroupD1Widget, 1, 0); + gridLayout4->addWidget(aGroupD2Widget, 1, 1); - Layout1->addWidget(Group1Sel, 2, 0); - Layout1->addWidget(Group1Spin, 2, 0); - Layout1->addWidget(Group2Spin, 2, 0); - Layout1->addWidget(Group3Spin, 2, 0); - Layout1->addWidget(Group4Spin, 2, 0); + gridLayout1->addWidget(aGroup1SelWidget, 2, 0); + gridLayout1->addWidget(Group1Spin, 2, 0); + gridLayout1->addWidget(Group2Spin, 2, 0); + gridLayout1->addWidget(Group3Spin, 2, 0); + gridLayout1->addWidget(Group4Spin, 2, 0); /***************************************************************/ /* signals and slots connections */ @@ -272,7 +303,7 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event) { if (event->type() == QEvent::KeyPress) { QKeyEvent* ke = (QKeyEvent*)event; - if (ke->key() == Key_Return) { + if (ke->key() == Qt::Key_Return) { if (object == Group1Spin->SpinBox_DX) { Group1Spin->buttonApply->animateClick(); return true; @@ -295,7 +326,7 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event) } } - return EntityGUI_Skeleton_QTD::eventFilter(object, event); + return QDialog::eventFilter(object, event); } @@ -358,7 +389,7 @@ void EntityGUI_SketcherDlg::InitClick() { disconnect(myGeometryGUI->getApp()->selectionMgr(), 0, this, 0); - Group1Sel->hide(); + ::qobject_cast( Group1Sel->gridLayout->parent() )->hide(); Group1Spin->hide(); Group2Spin->hide(); Group3Spin->hide(); @@ -377,14 +408,14 @@ void EntityGUI_SketcherDlg::TypeClicked(int constructorId) myConstructorId = constructorId; if ( myConstructorId == 0 ) // SEGMENT { - GroupD2->setEnabled(true); + ::qobject_cast( GroupD2->gridLayout->parent() )->setEnabled(true); RB_Dest1->setEnabled(true); RB_Dest1->setChecked(true); DestClicked(1); } else if ( myConstructorId == 1 ) // ARC { - GroupD2->setEnabled(false); + ::qobject_cast( GroupD2->gridLayout->parent() )->setEnabled(false); RB_Dest1->setEnabled(false); RB_Dest2->setChecked(true); DestClicked(0); @@ -398,21 +429,21 @@ void EntityGUI_SketcherDlg::TypeClicked(int constructorId) //================================================================================= void EntityGUI_SketcherDlg::DestClicked( int constructorId ) { - GroupPt->hide(); - GroupD1->hide(); - GroupD2->hide(); + ::qobject_cast( GroupPt->gridLayout->parent() )->hide(); + ::qobject_cast( GroupD1->gridLayout->parent() )->hide(); + ::qobject_cast( GroupD2->gridLayout->parent() )->hide(); if ( constructorId == 1 ) { // Point GroupPt->RB_Point1->setChecked(true); - GroupPt->show(); + ::qobject_cast( GroupPt->gridLayout->parent() )->show(); PointClicked(1); // XY } else if ( constructorId == 0 ) { // Direction GroupD1->RB_Dir11->setChecked(true); - GroupD1->show(); - GroupD2->show(); + ::qobject_cast( GroupD1->gridLayout->parent() )->show(); + ::qobject_cast( GroupD2->gridLayout->parent() )->show(); Dir1Clicked(2); // Angle } } @@ -469,7 +500,7 @@ void EntityGUI_SketcherDlg::PointClicked(int constructorId) myEditCurrentArgument = Group1Sel->LineEdit1; connect(myGeometryGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - Group1Sel->show(); + ::qobject_cast( Group1Sel->gridLayout->parent() )->show(); Group1Sel->buttonApply->setFocus(); SelectionIntoArgument(); } @@ -720,16 +751,16 @@ void EntityGUI_SketcherDlg::ClickOnEnd() // Verify validity of commands if ( myCommand.count() <= 2 ) { - SUIT_MessageBox::error1( SUIT_Session::session()->activeApplication()->desktop(), - tr( "GEOM_ERROR_STATUS" ), tr( "CANNOT_CLOSE" ), tr( "BUT_OK" ) ); + SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(), + tr( "GEOM_ERROR_STATUS" ), tr( "CANNOT_CLOSE" ), tr( "BUT_OK" ) ); return; } QString Command = myCommand.join( "" ) + GetNewCommand(); - Sketcher_Profile aProfile (Command.ascii()); + Sketcher_Profile aProfile (Command.toAscii()); Command = myCommand.join( "" ); - aProfile = Sketcher_Profile(Command.ascii()); + aProfile = Sketcher_Profile(Command.toAscii()); TopoDS_Shape myShape; if ( aProfile.IsDone() ) myShape = aProfile.GetShape(); @@ -806,10 +837,10 @@ void EntityGUI_SketcherDlg::ClickOnHelp() platform = "application"; #endif - SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), - QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), - QObject::tr("BUT_OK")); + SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), + QObject::tr("BUT_OK")); } } @@ -1325,13 +1356,13 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects ) //Last Shape QString Command1 = myCommand.join( "" ); - Sketcher_Profile aProfile1 (Command1.ascii()); + Sketcher_Profile aProfile1 (Command1.toAscii()); if(aProfile1.IsDone()) myShape1 = aProfile1.GetShape(); //Current Shape QString Command2 = Command1 + GetNewCommand(); - Sketcher_Profile aProfile2 (Command2.ascii()); + Sketcher_Profile aProfile2 (Command2.toAscii()); if(aProfile2.IsDone()) myShape2 = aProfile2.GetShape(); @@ -1367,7 +1398,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects ) myLastX1 == myLastX2 && myLastY1 == myLastY2 ) || myIsAllAdded ) { cmd = myCommand.join( "" ); - if ( Group1Sel->isVisible() ) { + if ( ::qobject_cast( Group1Sel->gridLayout->parent() )->isVisible() ) { Group1Sel->buttonApply->setEnabled(false); //Group1Sel->buttonApply->setFocus(); } @@ -1391,7 +1422,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects ) else { cmd = myCommand.join( "" ) + GetNewCommand(); - if ( Group1Sel->isVisible() ) { + if ( ::qobject_cast( Group1Sel->gridLayout->parent() )->isVisible() ) { Group1Sel->buttonApply->setEnabled(true); //Group1Sel->buttonApply->setFocus(); } @@ -1429,7 +1460,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects ) WPlane[8] = myWPlane.XDirection().Z(); GEOM::GEOM_Object_var anObj = - GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSketcher( cmd.latin1(), WPlane ); + GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSketcher( cmd.toLatin1(), WPlane ); if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); @@ -1495,7 +1526,7 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject, aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX ) return false; - if ( Group1Sel->isVisible() && !Group1Sel->buttonApply->isEnabled() || + if ( ::qobject_cast( Group1Sel->gridLayout->parent() )->isVisible() && !Group1Sel->buttonApply->isEnabled() || Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() || Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() || Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() || @@ -1536,7 +1567,7 @@ void EntityGUI_SketcherDlg::keyPressEvent( QKeyEvent* e ) if ( e->isAccepted() ) return; - if ( e->key() == Key_F1 ) + if ( e->key() == Qt::Key_F1 ) { e->accept(); ClickOnHelp(); diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h index 64260b2ae..60db0a59b 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.h +++ b/src/EntityGUI/EntityGUI_SketcherDlg.h @@ -36,36 +36,26 @@ #include "EntityGUI_Point_QTD.h" #include "EntityGUI_Dir1_QTD.h" #include "EntityGUI_Dir2_QTD.h" - #include "EntityGUI_1Sel_QTD.h" -#include "EntityGUI_1Spin.h" -#include "EntityGUI_2Spin.h" -#include "EntityGUI_3Spin.h" -#include "EntityGUI_4Spin.h" - -#include "EntityGUI.h" -#include "GeometryGUI.h" -#include +class EntityGUI_1Spin; +class EntityGUI_2Spin; +class EntityGUI_3Spin; +class EntityGUI_4Spin; -#include -#include -#include -#include -#include -#include +class GeometryGUI; //================================================================================= // class : EntityGUI_Dlg // purpose : //================================================================================= -class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper +class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public QDialog, public Ui::EntityGUI_Skeleton_QTD, public GEOMBase_Helper { Q_OBJECT public: EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0, + const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0, const double lineWidth = 2.); ~EntityGUI_SketcherDlg(); @@ -106,11 +96,11 @@ private : Standard_Real myLastX1, myLastY1; Standard_Real myLastX2, myLastY2; - EntityGUI_Point_QTD* GroupPt; - EntityGUI_Dir1_QTD* GroupD1; - EntityGUI_Dir2_QTD* GroupD2; + Ui::EntityGUI_Point_QTD* GroupPt; + Ui::EntityGUI_Dir1_QTD* GroupD1; + Ui::EntityGUI_Dir2_QTD* GroupD2; - EntityGUI_1Sel_QTD* Group1Sel; + Ui::EntityGUI_1Sel_QTD* Group1Sel; EntityGUI_1Spin* Group1Spin; EntityGUI_2Spin* Group2Spin; EntityGUI_3Spin* Group3Spin; diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx index cb6483921..f5eac405f 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx @@ -27,23 +27,25 @@ // $Header$ #include "EntityGUI_SubShapeDlg.h" -#include "GEOM_Displayer.h" + +#include "GeometryGUI.h" +#include "GEOMBase.h" #include "SUIT_Desktop.h" +#include "SUIT_ResourceMgr.h" #include "SUIT_Session.h" +#include "SUIT_ViewManager.h" +#include "SUIT_ViewWindow.h" #include "OCCViewer_ViewModel.h" #include "SalomeApp_Application.h" #include "LightApp_SelectionMgr.h" -#include "SALOME_ListIteratorOfListIO.hxx" #include #include #include #include -#include -#include -#include +#include //================================================================================= // class : EntityGUI_SubShapeDlg @@ -53,29 +55,35 @@ // TRUE to construct a modal dialog. //================================================================================= EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent, - const char* name, bool modal, WFlags fl) + const char* name, bool modal, Qt::WindowFlags fl) :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUBSHAPE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); - setCaption(tr("GEOM_SUBSHAPE_TITLE")); + setWindowTitle(tr("GEOM_SUBSHAPE_TITLE")); /***************************************************************/ GroupConstructors->setTitle(tr("GEOM_SUB_SHAPE")); - RadioButton1->setPixmap(image0); - RadioButton2->close(TRUE); - RadioButton3->close(TRUE); + RadioButton1->setIcon(image0); + RadioButton2->setAttribute( Qt::WA_DeleteOnClose ); + RadioButton2->close(); + RadioButton3->setAttribute( Qt::WA_DeleteOnClose ); + RadioButton3->close(); + + GroupPoints = new Ui::DlgRef_1Sel1Check1List_QTD(); + QWidget* aGroupPointsWidget = new QWidget(this); + GroupPoints->setupUi(aGroupPointsWidget); + aGroupPointsWidget->setObjectName("GroupPoints"); - GroupPoints = new DlgRef_1Sel1Check1List_QTD(this, "GroupPoints"); GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); GroupPoints->TextLabel1->setText(tr("GEOM_MAIN_OBJECT")); GroupPoints->TextLabel2->setText(tr("GEOM_SUBSHAPE_TYPE")); GroupPoints->CheckButton1->setText(tr("GEOM_SUBSHAPE_SELECT")); - GroupPoints->PushButton1->setPixmap(image1); + GroupPoints->PushButton1->setIcon(image1); GroupPoints->LineEdit1->setReadOnly( true ); - Layout1->addWidget(GroupPoints, 1, 0); + gridLayout1->addWidget(aGroupPointsWidget, 1, 0); /***************************************************************/ setHelpFileName("explode.htm"); @@ -106,15 +114,15 @@ void EntityGUI_SubShapeDlg::Init() myWithShape = true; /* type for sub shape selection */ - GroupPoints->ComboBox1->insertItem("Compound"); - GroupPoints->ComboBox1->insertItem("Compsolid"); - GroupPoints->ComboBox1->insertItem("Solid"); - GroupPoints->ComboBox1->insertItem("Shell"); - GroupPoints->ComboBox1->insertItem("Face"); - GroupPoints->ComboBox1->insertItem("Wire"); - GroupPoints->ComboBox1->insertItem("Edge"); - GroupPoints->ComboBox1->insertItem("Vertex"); - GroupPoints->ComboBox1->insertItem("Shape"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compound"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compsolid"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Solid"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shell"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Face"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Wire"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Edge"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Vertex"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shape"); if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() != OCCViewer_Viewer::Type()) @@ -227,7 +235,7 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument() GroupPoints->LineEdit1->setText( aString ); - int SelectedShapeType = GroupPoints->ComboBox1->currentItem(); + int SelectedShapeType = GroupPoints->ComboBox1->currentIndex(); int count = GroupPoints->ComboBox1->count(); if ( myWithShape ) @@ -250,7 +258,7 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument() { if ( myWithShape == false ) { - GroupPoints->ComboBox1->insertItem( "Shape" ); + GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Shape" ); myWithShape = true; } } @@ -273,16 +281,16 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument() { if ( myShape.ShapeType() != TopAbs_COMPOUND ) { - GroupPoints->ComboBox1->setCurrentItem( 0 ); + GroupPoints->ComboBox1->setCurrentIndex( 0 ); ComboTextChanged(); } } else - GroupPoints->ComboBox1->setCurrentItem(count1 - count + SelectedShapeType); + GroupPoints->ComboBox1->setCurrentIndex(count1 - count + SelectedShapeType); } else { - GroupPoints->ComboBox1->setCurrentItem( 0 ); + GroupPoints->ComboBox1->setCurrentIndex( 0 ); ComboTextChanged(); } @@ -367,26 +375,26 @@ void EntityGUI_SubShapeDlg::ResetStateOfDialog() myShape.Nullify(); myEditCurrentArgument->setText(""); - int SelectedShapeType = GroupPoints->ComboBox1->currentItem(); + int SelectedShapeType = GroupPoints->ComboBox1->currentIndex(); int count = GroupPoints->ComboBox1->count(); if ( myWithShape ) count = count - 1; /* type for sub shape selection */ GroupPoints->ComboBox1->clear(); - GroupPoints->ComboBox1->insertItem("Compound"); - GroupPoints->ComboBox1->insertItem("Compsolid"); - GroupPoints->ComboBox1->insertItem("Solid"); - GroupPoints->ComboBox1->insertItem("Shell"); - GroupPoints->ComboBox1->insertItem("Face"); - GroupPoints->ComboBox1->insertItem("Wire"); - GroupPoints->ComboBox1->insertItem("Edge"); - GroupPoints->ComboBox1->insertItem("Vertex"); - GroupPoints->ComboBox1->insertItem("Shape"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compound"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compsolid"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Solid"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shell"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Face"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Wire"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Edge"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Vertex"); + GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shape"); myWithShape = true; - GroupPoints->ComboBox1->setCurrentItem( 8 - count + SelectedShapeType ); + GroupPoints->ComboBox1->setCurrentIndex( 8 - count + SelectedShapeType ); ComboTextChanged(); updateButtonState(); @@ -488,7 +496,7 @@ bool EntityGUI_SubShapeDlg::isAllSubShapes() const //================================================================================= int EntityGUI_SubShapeDlg::shapeType() const { - int type = GroupPoints->ComboBox1->currentItem(); + int type = GroupPoints->ComboBox1->currentIndex(); if (myObject->_is_nil()) return type; diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h index 5d70497e9..d99635118 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.h +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h @@ -33,7 +33,6 @@ #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel1Check1List_QTD.h" - //================================================================================= // class : EntityGUI_SubShapeDlg // purpose : @@ -44,7 +43,7 @@ class GEOM_ENTITYGUI_EXPORT EntityGUI_SubShapeDlg : public GEOMBase_Skeleton public: EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0); + const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0); ~EntityGUI_SubShapeDlg(); protected: @@ -85,7 +84,7 @@ private: bool myWithShape; - DlgRef_1Sel1Check1List_QTD* GroupPoints; + Ui::DlgRef_1Sel1Check1List_QTD* GroupPoints; ObjectList myResult; }; diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am index 2afe2a1a2..4964aed39 100644 --- a/src/EntityGUI/Makefile.am +++ b/src/EntityGUI/Makefile.am @@ -37,15 +37,6 @@ salomeinclude_HEADERS = \ GEOM_EntityGUI.hxx dist_libEntityGUI_la_SOURCES = EntityGUI.cxx \ - EntityGUI_Skeleton_QTD.cxx \ - EntityGUI_Point_QTD.cxx \ - EntityGUI_Dir1_QTD.cxx \ - EntityGUI_Dir2_QTD.cxx \ - EntityGUI_1Sel_QTD.cxx \ - EntityGUI_1Spin_QTD.cxx \ - EntityGUI_2Spin_QTD.cxx \ - EntityGUI_3Spin_QTD.cxx \ - EntityGUI_4Spin_QTD.cxx \ EntityGUI_1Spin.cxx \ EntityGUI_2Spin.cxx \ EntityGUI_3Spin.cxx \ @@ -54,15 +45,6 @@ dist_libEntityGUI_la_SOURCES = EntityGUI.cxx \ EntityGUI_SubShapeDlg.cxx MOC_FILES = \ - EntityGUI_Skeleton_QTD_moc.cxx \ - EntityGUI_Point_QTD_moc.cxx \ - EntityGUI_Dir1_QTD_moc.cxx \ - EntityGUI_Dir2_QTD_moc.cxx \ - EntityGUI_1Sel_QTD_moc.cxx \ - EntityGUI_1Spin_QTD_moc.cxx \ - EntityGUI_2Spin_QTD_moc.cxx \ - EntityGUI_3Spin_QTD_moc.cxx \ - EntityGUI_4Spin_QTD_moc.cxx \ EntityGUI_1Spin_moc.cxx \ EntityGUI_2Spin_moc.cxx \ EntityGUI_3Spin_moc.cxx \ diff --git a/src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui index c88df1ae6..9611e596c 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui @@ -1,218 +1,182 @@ - -EntityGUI_1Sel_QTD - - - EntityGUI_1Sel_QTD + + + + + EntityGUI_1Sel_QTD + + + + 0 + 0 + 329 + 112 + - - - 0 - 0 - 329 - 112 - + + EntityGUI_1Sel_QTD - - EntityGUI_1Sel_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupBox1 + + + 0 + + + 6 + + + + + Values + + + + 11 - - Values + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout4 + + + + 0 + + + 6 - - - unnamed + + + + + 0 + 163 + + + + Expanding + + + Vertical - - 0 + + + + + + Create - - 6 + + + + + + 0 - - - Layout3 + + 6 + + + + + Redo - - - unnamed - - - 0 - - - 6 - - - - Spacer5 - - - Vertical - - - Expanding - - - - 0 - 163 - - - - - - buttonApply - - - Create - - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - buttonRedo - - - Redo - - - - - buttonUndo - - - Undo - - - - - - - - - Layout1 + + + + + + Undo - - - unnamed - - - 0 - - - 6 - - - - TextLabel1 - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 0 - 180 - - - - - - PushButton1 - - - - 0 - 0 - 0 - 0 - - - - - - - - - LineEdit1 - - - - 3 - 0 - 0 - 0 - - - - - - - - + + + + + + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + TL1 + + + false + + + + + + + + 0 + 180 + + + + Expanding + + + Vertical + + + + + + + + 0 + 0 + 0 + 0 + + + + + + + + + + + + 3 + 0 + 0 + 0 + + + + + + + + + - - - - - + + + + + qPixmapFromMimeSource + diff --git a/src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui index e1d0a7151..8985fa8b0 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui @@ -1,201 +1,167 @@ - -EntityGUI_1Spin_QTD - - - EntityGUI_1Spin_QTD + + + + + EntityGUI_1Spin_QTD + + + + 0 + 0 + 255 + 112 + - - - 0 - 0 - 255 - 112 - + + EntityGUI_1Spin_QTD - - EntityGUI_1Spin_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupBox1 + + + 0 + + + 6 + + + + + Values + + + + 11 - - Values + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout4 + + + + 0 - - - unnamed + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + TL1 - - 0 + + false - - 6 + + + + + + + 7 + 0 + 0 + 0 + - - - Layout1 + + + + + + + 0 + 82 + + + + Expanding + + + Vertical + + + + + + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + Redo - - - unnamed - - - 0 - - - 6 - - - - TextLabel1 - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - - - SpinBox1 - - - - 7 - 0 - 0 - 0 - - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 0 - 82 - - - - - - - - Layout3 + + + + + + Undo - - - unnamed - - - 0 - - - 6 - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - buttonRedo - - - Redo - - - - - buttonUndo - - - Undo - - - - - - - buttonApply - - - Create - - - - - Spacer5 - - - Vertical - - - Expanding - - - - 0 - 40 - - - - - - - - + + + + + + + + Create + + + + + + + + 0 + 40 + + + + Expanding + + + Vertical + + + + + + + + - - - - + + + + + qPixmapFromMimeSource + diff --git a/src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui index 938383c07..ec014f170 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui @@ -1,230 +1,197 @@ - -EntityGUI_2Spin_QTD - - - EntityGUI_2Spin_QTD + + + + + EntityGUI_2Spin_QTD + + + + 0 + 0 + 255 + 112 + - - - 0 - 0 - 255 - 112 - + + EntityGUI_2Spin_QTD - - EntityGUI_2Spin_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupBox1 + + + 0 + + + 6 + + + + + Values + + + + 11 - - Values + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout4 + + + + 0 + + + 6 - - - unnamed + + + + + 0 + 0 + 0 + 0 + + + + TL2 + + + false + + + + + + + + 0 + 0 + 0 + 0 + + + + TL1 + + + false + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 7 + 0 + 0 + 0 + - - 0 + + + + + + + 0 + 82 + - - 6 + + Expanding - - - Layout1 + + Vertical + + + + + + + + + 0 + + + 6 + + + + + + 0 + 51 + + + + Expanding + + + Vertical + + + + + + + 0 + + + 6 + + + + + Undo - - - unnamed - - - 0 - - - 6 - - - - TextLabel2 - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - - - TextLabel1 - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - - - SpinBox1 - - - - 7 - 0 - 0 - 0 - - - - - - SpinBox2 - - - - 7 - 0 - 0 - 0 - - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 0 - 82 - - - - - - - - Layout3 + + + + + + Redo - - - unnamed - - - 0 - - - 6 - - - - Spacer5 - - - Vertical - - - Expanding - - - - 0 - 51 - - - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - buttonUndo - - - Undo - - - - - buttonRedo - - - Redo - - - - - - - buttonApply - - - Create - - - - - - - + + + + + + + + Create + + + + + + + + - - - - + + + + + qPixmapFromMimeSource + diff --git a/src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui index c094d5791..08b867ef9 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui @@ -1,259 +1,227 @@ - -EntityGUI_3Spin_QTD - - - EntityGUI_3Spin_QTD + + + + + EntityGUI_3Spin_QTD + + + + 0 + 0 + 255 + 125 + - - - 0 - 0 - 255 - 125 - + + EntityGUI_3Spin_QTD - - EntityGUI_3Spin_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupBox1 + + + 0 + + + 6 + + + + + Values + + + + 11 - - Values + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout4 + + + + 0 + + + 6 - - - unnamed + + + + Create + + + + + + + + 0 + 121 + + + + Expanding + + + Vertical - - 0 + + + + + + 0 - - 6 + + 6 - - - Layout3 + + + + Undo - - - unnamed - - - 0 - - - 6 - - - - buttonApply - - - Create - - - - - Spacer5 - - - Vertical - - - Expanding - - - - 0 - 121 - - - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - buttonUndo - - - Undo - - - - - buttonRedo - - - Redo - - - - - - - - - Layout1 + + + + + + Redo - - - unnamed - - - 0 - - - 6 - - - - TextLabel2 - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - - - TextLabel1 - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - - - SpinBox1 - - - - 7 - 0 - 0 - 0 - - - - - - SpinBox2 - - - - 7 - 0 - 0 - 0 - - - - - - TextLabel3 - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 0 - 82 - - - - - - SpinBox3 - - - - 7 - 0 - 0 - 0 - - - - - - - - + + + + + + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + TL2 + + + false + + + + + + + + 0 + 0 + 0 + 0 + + + + TL1 + + + false + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + 0 + + + + TL3 + + + false + + + + + + + + 0 + 82 + + + + Expanding + + + Vertical + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + - - - - + + + + + qPixmapFromMimeSource + diff --git a/src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui index 956ce0d1b..d6b3453be 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui @@ -1,288 +1,257 @@ - -EntityGUI_4Spin_QTD - - - EntityGUI_4Spin_QTD + + + + + EntityGUI_4Spin_QTD + + + + 0 + 0 + 255 + 154 + - - - 0 - 0 - 255 - 154 - + + EntityGUI_4Spin_QTD - - EntityGUI_4Spin_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupBox1 + + + 0 + + + 6 + + + + + Values + + + + 11 - - Values + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout4 + + + + 0 - - - unnamed - - - 0 + + 6 + + + + + 0 - - 6 + + 6 - - - Layout3 + + + + Redo - - - unnamed - - - 0 - - - 6 - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - buttonRedo - - - Redo - - - - - buttonUndo - - - Undo - - - - - - - Spacer5 - - - Vertical - - - Expanding - - - - 0 - 45 - - - - - - buttonApply - - - Create - - - - - - - Layout1 + + + + + + Undo - - - unnamed - - - 0 - - - 6 - - - - SpinBox3 - - - - 7 - 0 - 0 - 0 - - - - - - SpinBox2 - - - - 7 - 0 - 0 - 0 - - - - - - TextLabel2 - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - - - Spacer1 - - - Vertical - - - Expanding - - - - 0 - 70 - - - - - - SpinBox4 - - - - 7 - 0 - 0 - 0 - - - - - - TextLabel3 - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - - - SpinBox1 - - - - 7 - 0 - 0 - 0 - - - - - - TextLabel1 - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - - - TextLabel4 - - - - 0 - 0 - 0 - 0 - - - - TL4 - - - - - - - + + + + + + + + + 0 + 45 + + + + Expanding + + + Vertical + + + + + + + Create + + + + + + + + + 0 + + + 6 + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + 0 + + + + TL2 + + + false + + + + + + + + 0 + 70 + + + + Expanding + + + Vertical + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + 0 + + + + TL3 + + + false + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + 0 + + + + TL1 + + + false + + + + + + + + 0 + 0 + 0 + 0 + + + + TL4 + + + false + + + + + + + + - - - - + + + + + qPixmapFromMimeSource + diff --git a/src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui index 59f644641..17e1dca50 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui @@ -1,112 +1,96 @@ - -EntityGUI_Dir1_QTD - - - EntityGUI_Dir1_QTD + + + + + EntityGUI_Dir1_QTD + + + + 0 + 0 + 131 + 123 + - - - 0 - 0 - 131 - 123 - + + EntityGUI_Dir1_QTD - - EntityGUI_Dir1_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupDir1 - - - - 7 - 0 - 0 - 0 - + + + 0 + + + 6 + + + + + + 7 + 0 + 0 + 0 + + + + Direction + + + + 11 - - Direction + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout1 + + + + Perpendicular + + + + + + + Tangent + + + + + + + Angle + + + + + + + VX-VY - - - unnamed - - - 0 - - - 6 - - - - RB_Dir12 - - - Perpendicular - - - - - RB_Dir13 - - - Tangent - - - - - RB_Dir11 - - - Angle - - - - - RB_Dir14 - - - VX-VY - - - - - + + + + + - - - + + + + + qPixmapFromMimeSource + RB_Dir11 RB_Dir12 RB_Dir13 RB_Dir14 - - - + + diff --git a/src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui index 617d3c3f6..8d2cd1579 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui @@ -1,120 +1,104 @@ - -EntityGUI_Dir2_QTD - - - EntityGUI_Dir2_QTD + + + + + EntityGUI_Dir2_QTD + + + + 0 + 0 + 124 + 106 + - - - 0 - 0 - 124 - 106 - + + EntityGUI_Dir2_QTD - - EntityGUI_Dir2_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupDir2 - - - - 7 - 7 - 0 - 0 - + + + 0 + + + 6 + + + + + + 7 + 7 + 0 + 0 + + + + Direction + + + + 11 - - Direction + + 6 - - - unnamed + + + + 0 - - 11 + + 6 - - 6 - - - - Layout1 + + + + X + + + + + + + Y + + + + + + + + 0 + 20 + + + + Expanding + + + Vertical + + + + + + + Length - - - unnamed - - - 0 - - - 6 - - - - RB_Dir22 - - - X - - - - - RB_Dir23 - - - Y - - - - - Spacer4 - - - Vertical - - - Expanding - - - - 0 - 20 - - - - - - RB_Dir21 - - - Length - - - - - + + + + + - - - + + + + + qPixmapFromMimeSource + RB_Dir21 RB_Dir22 RB_Dir23 - - - + + diff --git a/src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui index 8e0bd22ad..668d778e5 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui @@ -1,103 +1,88 @@ - -EntityGUI_Point_QTD - - - EntityGUI_Point_QTD + + + + + EntityGUI_Point_QTD + + + + 0 + 0 + 124 + 106 + - - - 0 - 0 - 124 - 106 - + + EntityGUI_Point_QTD - - EntityGUI_Point_QTD - - - - unnamed - - - 0 - - - 6 - - - - GroupPoint - - - - 7 - 0 - 0 - 0 - + + + 0 + + + 6 + + + + + + 7 + 0 + 0 + 0 + + + + Point + + + + 11 - - Point + + 6 - - - unnamed - - - 11 + + + + 0 - - 6 + + 6 - - - Layout1 + + + + Relative + + + + + + + Absolute + + + + + + + Selection - - - unnamed - - - 0 - - - 6 - - - - RB_Point2 - - - Relative - - - - - RB_Point1 - - - Absolute - - - - - RB_Point3 - - - Selection - - - - - + + + + + - - - + + + + + qPixmapFromMimeSource + RB_Point1 RB_Point2 RB_Point3 - - - + + diff --git a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui index c257a8086..6e65ff423 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui @@ -1,380 +1,315 @@ - -EntityGUI_Skeleton_QTD - - - EntityGUI_Skeleton_QTD + + + + + EntityGUI_Skeleton_QTD + + + + 0 + 0 + 317 + 276 + - - - 0 - 0 - 317 - 276 - + + + 5 + 7 + 0 + 0 + - - - 5 - 7 - 0 - 0 - + + EntityGUI_Skeleton_QTD - - EntityGUI_Skeleton_QTD - - - - unnamed - - - 11 - - + + + 11 + + + 6 + + + + + 0 + + 6 - - - - Layout1 - - - - unnamed - - - 0 + + + + + + 7 + 7 + 0 + 0 + + + + + + + + + + + + 5 + 0 + 0 + 0 + + + + Element Type + + + + 11 - - 6 + + 6 - - - GroupVal + + + + 0 - - - 7 - 7 - 0 - 0 - + + 6 - - + + + + Segment + + + + + + + Arc + + + + + + + + + + + + + 7 + 0 + 0 + 0 + + + + Destination + + + + 11 + + + 6 + + + + + 0 - - - - GroupConstructors + + 6 - - - 5 + + + + + 7 0 0 0 - - - - Element Type - - - - unnamed + - - 11 + + Type - + + + 11 + + 6 - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - RadioButton1 - - - Segment - + + + + + 0 + + + 6 + + + + + Direction + - - - RadioButton2 - - - Arc - + + + + + Point + - - - - - - - GroupDest - - - + + + + + + + + + + 7 - 0 + 7 0 0 - - - - Destination - - - - unnamed + - - 11 + + - + + + 11 + + 6 - - - - Layout5 - - - - unnamed - - - 0 - - - 6 - - - - GroupDest1 - - - - 7 - 0 - 0 - 0 - - - - Type - - - - unnamed - - - 11 - - - 6 - - - - Layout4 - - - - unnamed - - - 0 - - - 6 - - - - RB_Dest2 - - - Direction - - - - - RB_Dest1 - - - Point - - - - - - - - - GroupDest2 - - - - 7 - 7 - 0 - 0 - - - - - - - - unnamed - - - 11 - - - 6 - - - - - - GroupDest3 - - - - 7 - 7 - 0 - 0 - - - - - - - - unnamed - - - 11 - - - 6 - - - - - - - - - - GroupButtons - - - + + + + + + + + 7 - 0 + 7 0 0 - + + + + + + + + 11 + + + 6 + + + + + + + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + 11 + + + 6 + + + + + 0 - - + + 6 - - - unnamed + + + + End Sketch - - 11 + + + + + + Close Sketch - - 6 + + + + + + + 91 + 0 + - - - Layout3 - - - - unnamed - - - 0 - - - 6 - - - - buttonEnd - - - End Sketch - - - - - buttonClose - - - Close Sketch - - - - - Spacer1 - - - Horizontal - - - Expanding - - - - 91 - 0 - - - - - - buttonCancel - - - &Cancel - - - - - buttonHelp - - - &Help - - - - - - - - - - - + + Expanding + + + Horizontal + + + + + + + &Cancel + + + + + + + &Help + + + + + + + + + + + + + + qPixmapFromMimeSource + RadioButton1 RadioButton2 RB_Dest1 @@ -382,6 +317,5 @@ buttonEnd buttonClose buttonCancel - - - + + diff --git a/src/EntityGUI/UIFiles/ui_to_cxx b/src/EntityGUI/UIFiles/ui_to_cxx index 13bc0ac3d..4fef1c79e 100755 --- a/src/EntityGUI/UIFiles/ui_to_cxx +++ b/src/EntityGUI/UIFiles/ui_to_cxx @@ -14,34 +14,24 @@ # 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +#// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #!/bin/sh -uic -o EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui -uic -o EntityGUI_Skeleton_QTD.cxx -impl EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui +uic -o ../EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui -uic -o EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui -uic -o EntityGUI_Point_QTD.cxx -impl EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui +uic -o ../EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui -uic -o EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui -uic -o EntityGUI_Dir1_QTD.cxx -impl EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui +uic -o ../EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui -uic -o EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui -uic -o EntityGUI_Dir2_QTD.cxx -impl EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui +uic -o ../EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui -uic -o EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui -uic -o EntityGUI_1Spin_QTD.cxx -impl EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui +uic -o ../EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui -uic -o EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui -uic -o EntityGUI_2Spin_QTD.cxx -impl EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui +uic -o ../EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui -uic -o EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui -uic -o EntityGUI_3Spin_QTD.cxx -impl EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui +uic -o ../EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui -uic -o EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui -uic -o EntityGUI_4Spin_QTD.cxx -impl EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui +uic -o ../EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui -uic -o EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui -uic -o EntityGUI_1Sel_QTD.cxx -impl EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui +uic -o ../EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui diff --git a/src/src.pro b/src/src.pro index 83d25693e..f9df99fb5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -29,7 +29,7 @@ SUBDIRS += DisplayGUI SUBDIRS += BasicGUI SUBDIRS += PrimitiveGUI SUBDIRS += GenerationGUI -#SUBDIRS += EntityGUI +SUBDIRS += EntityGUI #SUBDIRS += BuildGUI #SUBDIRS += BooleanGUI #SUBDIRS += TransformationGUI