From: dcq Date: Tue, 4 May 2004 14:01:08 +0000 (+0000) Subject: DCQ : merge X-Git-Tag: Ecole_Ete_a3~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6342d13457a4602c48a25626f60ca7400f7d6329;p=modules%2Fgeom.git DCQ : merge --- diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index 54e4116cb..aef6d70b0 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -201,7 +201,7 @@ gp_Pnt BasicGUI::ConvertClickToPoint(Standard_Real x, Standard_Real y, Handle(V3 gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir); Standard_Real X, Y, Z; - aView->Convert(x, y, X, Y, Z); + aView->Convert(int(x), int(y), X, Y, Z); gp_Pnt ConvertedPoint(X, Y, Z); gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint); diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index 751a6e686..4c3bfaa9c 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_ArcDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_ArcDlg() // purpose : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx index 14b866419..a10e4049f 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.cxx +++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_CircleDlg.h" #include @@ -35,6 +34,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_CircleDlg() // purpose : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index e7ea7199f..80321b426 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -25,7 +25,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_EllipseDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_EllipseDlg() // purpose : Constructs a BasicGUI_EllipseDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index fe9f75b50..a146f4d8e 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_LineDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_LineDlg() // purpose : Constructs a BasicGUI_LineDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index b280bfeae..6b3a77f8f 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_PlaneDlg.h" #include @@ -37,6 +36,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_PlaneDlg() // purpose : Constructs a BasicGUI_PlaneDlg which is a child of 'parent', with the diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 45dc97b16..0ef6fcdfe 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header: -using namespace std; #include "DisplayGUI.h" #include "QAD_RightFrame.h" @@ -39,6 +38,10 @@ using namespace std; #include +#include "utilities.h" + +using namespace std; + //======================================================================= // function : DisplayGUI() // purpose : Constructor diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.cxx b/src/DlgRef/DlgRef_Skeleton_QTD.cxx index cb1100af3..897e3f19c 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.cxx +++ b/src/DlgRef/DlgRef_Skeleton_QTD.cxx @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui' ** -** Created: mar sep 23 15:06:58 2003 +** Created: Fri Apr 16 12:57:26 2004 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include #include @@ -29,7 +31,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo { if ( !name ) setName( "DlgRef_Skeleton_QTD" ); - resize( 307, 147 ); + resize( 321, 295 ); setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); setCaption( trUtf8( "DlgRef_Skeleton_QTD" ) ); setSizeGripEnabled( TRUE ); @@ -37,6 +39,12 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); + GroupMedium = new QGroupBox( this, "GroupMedium" ); + GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) ); + GroupMedium->setTitle( trUtf8( "" ) ); + + Layout1->addWidget( GroupMedium, 2, 0 ); + GroupButtons = new QGroupBox( this, "GroupButtons" ); GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) ); GroupButtons->setTitle( trUtf8( "" ) ); @@ -63,7 +71,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout3->addWidget( buttonCancel ); GroupButtonsLayout->addLayout( Layout3 ); - Layout1->addWidget( GroupButtons, 2, 0 ); + Layout1->addWidget( GroupButtons, 3, 0 ); GroupConstructors = new QButtonGroup( this, "GroupConstructors" ); GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) ); @@ -92,11 +100,28 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout1->addWidget( GroupConstructors, 0, 0 ); - GroupMedium = new QGroupBox( this, "GroupMedium" ); - GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) ); - GroupMedium->setTitle( trUtf8( "" ) ); + GroupBoxName = new QGroupBox( this, "GroupBoxName" ); + GroupBoxName->setTitle( trUtf8( "Result name" ) ); + GroupBoxName->setColumnLayout(0, Qt::Vertical ); + GroupBoxName->layout()->setSpacing( 6 ); + GroupBoxName->layout()->setMargin( 11 ); + GroupBoxNameLayout = new QGridLayout( GroupBoxName->layout() ); + GroupBoxNameLayout->setAlignment( Qt::AlignTop ); + + Layout66 = new QGridLayout( 0, 1, 1, 0, 6, "Layout66"); + + ResultName = new QLineEdit( GroupBoxName, "ResultName" ); + + Layout66->addWidget( ResultName, 0, 1 ); + + NameLabel = new QLabel( GroupBoxName, "NameLabel" ); + NameLabel->setText( trUtf8( "Name" ) ); + + Layout66->addWidget( NameLabel, 0, 0 ); + + GroupBoxNameLayout->addLayout( Layout66, 0, 0 ); - Layout1->addWidget( GroupMedium, 1, 0 ); + Layout1->addWidget( GroupBoxName, 1, 0 ); DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 ); } diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h index f16363d60..38d6d83d6 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.h +++ b/src/DlgRef/DlgRef_Skeleton_QTD.h @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui' ** -** Created: mar sep 23 15:06:57 2003 +** Created: Fri Apr 16 12:57:26 2004 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -16,6 +16,8 @@ class QHBoxLayout; class QGridLayout; class QButtonGroup; class QGroupBox; +class QLabel; +class QLineEdit; class QPushButton; class QRadioButton; @@ -27,6 +29,7 @@ public: DlgRef_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DlgRef_Skeleton_QTD(); + QGroupBox* GroupMedium; QGroupBox* GroupButtons; QPushButton* buttonOk; QPushButton* buttonApply; @@ -35,7 +38,9 @@ public: QRadioButton* RadioButton1; QRadioButton* RadioButton2; QRadioButton* RadioButton3; - QGroupBox* GroupMedium; + QGroupBox* GroupBoxName; + QLineEdit* ResultName; + QLabel* NameLabel; protected: @@ -45,6 +50,8 @@ protected: QHBoxLayout* Layout3; QGridLayout* GroupConstructorsLayout; QHBoxLayout* Layout2; + QGridLayout* GroupBoxNameLayout; + QGridLayout* Layout66; }; #endif // DLGREF_SKELETON_QTD_H diff --git a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui index 0c6e57718..eed5c27f4 100644 --- a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui +++ b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui @@ -8,8 +8,8 @@ 0 0 - 307 - 147 + 321 + 295 @@ -51,6 +51,22 @@ 6 + + GroupMedium + + + + 7 + 7 + 0 + 0 + + + + + + + GroupButtons @@ -203,19 +219,51 @@ - GroupMedium - - - - 7 - 7 - 0 - 0 - + GroupBoxName - + Result name + + + unnamed + + + 11 + + + 6 + + + + Layout66 + + + + unnamed + + + 0 + + + 6 + + + + ResultName + + + + + NameLabel + + + Name + + + + +