mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-03-16 01:11:26 +05:00
DCQ : merge
This commit is contained in:
parent
ddd9c82610
commit
6342d13457
@ -201,7 +201,7 @@ gp_Pnt BasicGUI::ConvertClickToPoint(Standard_Real x, Standard_Real y, Handle(V3
|
|||||||
|
|
||||||
gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir);
|
gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir);
|
||||||
Standard_Real X, Y, Z;
|
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_Pnt ConvertedPoint(X, Y, Z);
|
||||||
|
|
||||||
gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint);
|
gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint);
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_ArcDlg.h"
|
#include "BasicGUI_ArcDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <Geom_TrimmedCurve.hxx>
|
#include <Geom_TrimmedCurve.hxx>
|
||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_ArcDlg()
|
// class : BasicGUI_ArcDlg()
|
||||||
// purpose : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_CircleDlg.h"
|
#include "BasicGUI_CircleDlg.h"
|
||||||
|
|
||||||
#include <gp_Lin.hxx>
|
#include <gp_Lin.hxx>
|
||||||
@ -35,6 +34,10 @@ using namespace std;
|
|||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_CircleDlg()
|
// class : BasicGUI_CircleDlg()
|
||||||
// purpose : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_EllipseDlg.h"
|
#include "BasicGUI_EllipseDlg.h"
|
||||||
|
|
||||||
#include <gp_Lin.hxx>
|
#include <gp_Lin.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_EllipseDlg()
|
// class : BasicGUI_EllipseDlg()
|
||||||
// purpose : Constructs a BasicGUI_EllipseDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_EllipseDlg which is a child of 'parent', with the
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_LineDlg.h"
|
#include "BasicGUI_LineDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||||
@ -34,6 +33,10 @@ using namespace std;
|
|||||||
#include <BRep_Builder.hxx>
|
#include <BRep_Builder.hxx>
|
||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_LineDlg()
|
// class : BasicGUI_LineDlg()
|
||||||
// purpose : Constructs a BasicGUI_LineDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_LineDlg which is a child of 'parent', with the
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header$
|
// $Header$
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "BasicGUI_PlaneDlg.h"
|
#include "BasicGUI_PlaneDlg.h"
|
||||||
|
|
||||||
#include <BRepBuilderAPI_MakeFace.hxx>
|
#include <BRepBuilderAPI_MakeFace.hxx>
|
||||||
@ -37,6 +36,10 @@ using namespace std;
|
|||||||
#include <Precision.hxx>
|
#include <Precision.hxx>
|
||||||
#include "QAD_Config.h"
|
#include "QAD_Config.h"
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : BasicGUI_PlaneDlg()
|
// class : BasicGUI_PlaneDlg()
|
||||||
// purpose : Constructs a BasicGUI_PlaneDlg which is a child of 'parent', with the
|
// purpose : Constructs a BasicGUI_PlaneDlg which is a child of 'parent', with the
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
// Module : GEOM
|
// Module : GEOM
|
||||||
// $Header:
|
// $Header:
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
#include "DisplayGUI.h"
|
#include "DisplayGUI.h"
|
||||||
|
|
||||||
#include "QAD_RightFrame.h"
|
#include "QAD_RightFrame.h"
|
||||||
@ -39,6 +38,10 @@ using namespace std;
|
|||||||
|
|
||||||
#include <AIS_ListIteratorOfListOfInteractive.hxx>
|
#include <AIS_ListIteratorOfListOfInteractive.hxx>
|
||||||
|
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
// function : DisplayGUI()
|
// function : DisplayGUI()
|
||||||
// purpose : Constructor
|
// purpose : Constructor
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
|
** 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)
|
** by: The User Interface Compiler (uic)
|
||||||
**
|
**
|
||||||
** WARNING! All changes made in this file will be lost!
|
** WARNING! All changes made in this file will be lost!
|
||||||
@ -11,6 +11,8 @@
|
|||||||
#include <qvariant.h>
|
#include <qvariant.h>
|
||||||
#include <qbuttongroup.h>
|
#include <qbuttongroup.h>
|
||||||
#include <qgroupbox.h>
|
#include <qgroupbox.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qlineedit.h>
|
||||||
#include <qpushbutton.h>
|
#include <qpushbutton.h>
|
||||||
#include <qradiobutton.h>
|
#include <qradiobutton.h>
|
||||||
#include <qlayout.h>
|
#include <qlayout.h>
|
||||||
@ -29,7 +31,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo
|
|||||||
{
|
{
|
||||||
if ( !name )
|
if ( !name )
|
||||||
setName( "DlgRef_Skeleton_QTD" );
|
setName( "DlgRef_Skeleton_QTD" );
|
||||||
resize( 307, 147 );
|
resize( 321, 295 );
|
||||||
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
|
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
|
||||||
setCaption( trUtf8( "DlgRef_Skeleton_QTD" ) );
|
setCaption( trUtf8( "DlgRef_Skeleton_QTD" ) );
|
||||||
setSizeGripEnabled( TRUE );
|
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");
|
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 = new QGroupBox( this, "GroupButtons" );
|
||||||
GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
|
GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
|
||||||
GroupButtons->setTitle( trUtf8( "" ) );
|
GroupButtons->setTitle( trUtf8( "" ) );
|
||||||
@ -63,7 +71,7 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo
|
|||||||
Layout3->addWidget( buttonCancel );
|
Layout3->addWidget( buttonCancel );
|
||||||
GroupButtonsLayout->addLayout( Layout3 );
|
GroupButtonsLayout->addLayout( Layout3 );
|
||||||
|
|
||||||
Layout1->addWidget( GroupButtons, 2, 0 );
|
Layout1->addWidget( GroupButtons, 3, 0 );
|
||||||
|
|
||||||
GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
|
GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
|
||||||
GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
|
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 );
|
Layout1->addWidget( GroupConstructors, 0, 0 );
|
||||||
|
|
||||||
GroupMedium = new QGroupBox( this, "GroupMedium" );
|
GroupBoxName = new QGroupBox( this, "GroupBoxName" );
|
||||||
GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) );
|
GroupBoxName->setTitle( trUtf8( "Result name" ) );
|
||||||
GroupMedium->setTitle( trUtf8( "" ) );
|
GroupBoxName->setColumnLayout(0, Qt::Vertical );
|
||||||
|
GroupBoxName->layout()->setSpacing( 6 );
|
||||||
|
GroupBoxName->layout()->setMargin( 11 );
|
||||||
|
GroupBoxNameLayout = new QGridLayout( GroupBoxName->layout() );
|
||||||
|
GroupBoxNameLayout->setAlignment( Qt::AlignTop );
|
||||||
|
|
||||||
Layout1->addWidget( GroupMedium, 1, 0 );
|
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( GroupBoxName, 1, 0 );
|
||||||
|
|
||||||
DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
|
DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
|
** 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)
|
** by: The User Interface Compiler (uic)
|
||||||
**
|
**
|
||||||
** WARNING! All changes made in this file will be lost!
|
** WARNING! All changes made in this file will be lost!
|
||||||
@ -16,6 +16,8 @@ class QHBoxLayout;
|
|||||||
class QGridLayout;
|
class QGridLayout;
|
||||||
class QButtonGroup;
|
class QButtonGroup;
|
||||||
class QGroupBox;
|
class QGroupBox;
|
||||||
|
class QLabel;
|
||||||
|
class QLineEdit;
|
||||||
class QPushButton;
|
class QPushButton;
|
||||||
class QRadioButton;
|
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( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
|
||||||
~DlgRef_Skeleton_QTD();
|
~DlgRef_Skeleton_QTD();
|
||||||
|
|
||||||
|
QGroupBox* GroupMedium;
|
||||||
QGroupBox* GroupButtons;
|
QGroupBox* GroupButtons;
|
||||||
QPushButton* buttonOk;
|
QPushButton* buttonOk;
|
||||||
QPushButton* buttonApply;
|
QPushButton* buttonApply;
|
||||||
@ -35,7 +38,9 @@ public:
|
|||||||
QRadioButton* RadioButton1;
|
QRadioButton* RadioButton1;
|
||||||
QRadioButton* RadioButton2;
|
QRadioButton* RadioButton2;
|
||||||
QRadioButton* RadioButton3;
|
QRadioButton* RadioButton3;
|
||||||
QGroupBox* GroupMedium;
|
QGroupBox* GroupBoxName;
|
||||||
|
QLineEdit* ResultName;
|
||||||
|
QLabel* NameLabel;
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@ -45,6 +50,8 @@ protected:
|
|||||||
QHBoxLayout* Layout3;
|
QHBoxLayout* Layout3;
|
||||||
QGridLayout* GroupConstructorsLayout;
|
QGridLayout* GroupConstructorsLayout;
|
||||||
QHBoxLayout* Layout2;
|
QHBoxLayout* Layout2;
|
||||||
|
QGridLayout* GroupBoxNameLayout;
|
||||||
|
QGridLayout* Layout66;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // DLGREF_SKELETON_QTD_H
|
#endif // DLGREF_SKELETON_QTD_H
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>307</width>
|
<width>321</width>
|
||||||
<height>147</height>
|
<height>295</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -51,6 +51,22 @@
|
|||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QGroupBox" row="2" column="0">
|
<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">
|
<property name="name">
|
||||||
<cstring>GroupButtons</cstring>
|
<cstring>GroupButtons</cstring>
|
||||||
</property>
|
</property>
|
||||||
@ -203,19 +219,51 @@
|
|||||||
</widget>
|
</widget>
|
||||||
<widget class="QGroupBox" row="1" column="0">
|
<widget class="QGroupBox" row="1" column="0">
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<cstring>GroupMedium</cstring>
|
<cstring>GroupBoxName</cstring>
|
||||||
</property>
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy>
|
|
||||||
<hsizetype>7</hsizetype>
|
|
||||||
<vsizetype>7</vsizetype>
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string></string>
|
<string>Result name</string>
|
||||||
</property>
|
</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>
|
</widget>
|
||||||
</grid>
|
</grid>
|
||||||
</widget>
|
</widget>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user