DCQ : merge

diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index 54e4116cb4a366d3de49bfd374d5aea0450870b4..aef6d70b024033bc9b47a2392233dbcd987d7f2f 100644 (file)
--- 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 751a6e686a41b6e0e668093429b760edd779b2a2..4c3bfaa9c9f6326efd4af72a4e8aea83465963ec 100644 (file)
--- 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 <BRepBuilderAPI_MakeEdge.hxx>
@@ -34,6 +33,10 @@ using namespace std;
 #include <Geom_TrimmedCurve.hxx>
 #include <Precision.hxx>
 
+#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 14b866419329f212910b0677e64ef756ede94700..a10e4049f33e9720f2a9b8490f5d5baa54f53e00 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -35,6 +34,10 @@ using namespace std;
 #include <BRepAdaptor_Curve.hxx>
 #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 e7ea7199f855cbbd644afc635afe3f042867d86c..80321b426bfae379a0e8e8a973387770466f3d14 100644 (file)
--- 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 <gp_Lin.hxx>
@@ -34,6 +33,10 @@ using namespace std;
 #include <BRepAdaptor_Curve.hxx>
 #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 fe9f75b50a70b7960bec368bf33633660f949ee8..a146f4d8eaa2d7c4fcb1b60760d52e1dcb9e8df5 100644 (file)
--- 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 <BRepBuilderAPI_MakeEdge.hxx>
@@ -34,6 +33,10 @@ using namespace std;
 #include <BRep_Builder.hxx>
 #include <Precision.hxx>
 
+#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 b280bfeae37fec572ecb52a33e2141df68adb4f3..6b3a77f8f5e9b6c25b3709192a3410d16b593601 100644 (file)
--- 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 <BRepBuilderAPI_MakeFace.hxx>
@@ -37,6 +36,10 @@ using namespace std;
 #include <Precision.hxx>
 #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 45dc97b162c98b9bccf7af63f36c7927ea896996..0ef6fcdfe14d03599d0bf493f0826012f7dbd1c0 100644 (file)
--- 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 <AIS_ListIteratorOfListOfInteractive.hxx>
 
+#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 cb1100af37069b1cca0f7eaf023d77b4d6d06817..897e3f19c7804d1f1f8ea4ad4ac8c056cae8ffd0 100644 (file)
--- 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 <qvariant.h>
 #include <qbuttongroup.h>
 #include <qgroupbox.h>
+#include <qlabel.h>
+#include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
@@ -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 f16363d60729a8718359a42c4adc407b3d10d8e2..38d6d83d65a197146d707002c65f1db4bd665157 100644 (file)
--- 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 0c6e57718d3794268f150a9f38d1995fccb85925..eed5c27f4e8f2f6a651c8df5d2d99f94db3b1df1 100644 (file)
--- a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
+++ b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>307</width>
-            <height>147</height>
+            <width>321</width>
+            <height>295</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -51,6 +51,22 @@
                     <number>6</number>
                 </property>
                 <widget class="QGroupBox" row="2" column="0">
+                    <property name="name">
+                        <cstring>GroupMedium</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>7</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="title">
+                        <string></string>
+                    </property>
+                </widget>
+                <widget class="QGroupBox" row="3" column="0">
                     <property name="name">
                         <cstring>GroupButtons</cstring>
                     </property>
@@ -203,19 +219,51 @@
                 </widget>
                 <widget class="QGroupBox" row="1" column="0">
                     <property name="name">
-                        <cstring>GroupMedium</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>7</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
+                        <cstring>GroupBoxName</cstring>
                     </property>
                     <property name="title">
-                        <string></string>
+                        <string>Result name</string>
                     </property>
+                    <grid>
+                        <property name="name">
+                            <cstring>unnamed</cstring>
+                        </property>
+                        <property name="margin">
+                            <number>11</number>
+                        </property>
+                        <property name="spacing">
+                            <number>6</number>
+                        </property>
+                        <widget class="QLayoutWidget" row="0" column="0">
+                            <property name="name">
+                                <cstring>Layout66</cstring>
+                            </property>
+                            <grid>
+                                <property name="name">
+                                    <cstring>unnamed</cstring>
+                                </property>
+                                <property name="margin">
+                                    <number>0</number>
+                                </property>
+                                <property name="spacing">
+                                    <number>6</number>
+                                </property>
+                                <widget class="QLineEdit" row="0" column="1">
+                                    <property name="name">
+                                        <cstring>ResultName</cstring>
+                                    </property>
+                                </widget>
+                                <widget class="QLabel" row="0" column="0">
+                                    <property name="name">
+                                        <cstring>NameLabel</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string>Name</string>
+                                    </property>
+                                </widget>
+                            </grid>
+                        </widget>
+                    </grid>
                 </widget>
             </grid>
         </widget>