From e0d9c97d8aeb5d61126e37273688111fd1f19de3 Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 9 Apr 2008 08:28:48 +0000 Subject: [PATCH] first executable version --- src/BasicGUI/BasicGUI_CurveDlg.h | 2 +- src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h | 4 +- src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx | 82 ++++++++++----------- src/DlgRef/DlgRef_2Sel3Spin2Rb.h | 61 +++++++-------- src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h | 4 +- src/GEOM/GEOM_Engine.cxx | 3 + src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx | 11 ++- 7 files changed, 83 insertions(+), 84 deletions(-) diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index 6a1b6fa9b..84b301d7d 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -63,7 +63,7 @@ private : DlgRef_1Sel_QTD* GroupPoints; GEOM::ListOfGO_var myPoints; - list myOrderedSel;//!< This list used for managing orderes selection + std::list myOrderedSel;//!< This list used for managing orderes selection private slots: void ClickOnOk(); diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h index 0f7fbc84b..1d856dbf5 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h @@ -10,6 +10,8 @@ #ifndef DLGREF_1SEL5SPIN1CHECK_QTD_H #define DLGREF_1SEL5SPIN1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include @@ -24,7 +26,7 @@ class QSpinBox; class QCheckBox; class QLineEdit; -class DlgRef_1Sel5Spin1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx b/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx index a17d55e41..f310e2287 100755 --- a/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx +++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx @@ -1,41 +1,41 @@ -// File : DlgRef_2Sel2Spin.cxx -// Author : Dmitry MATVEITCHEV -// Module : GEOM -// $Header: - -#include "DlgRef_2Sel3Spin2Rb.h" -#include - -#include -#include -#include -#include - -/* - * Constructs a DlgRef_2Sel3Spin2Rb which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - */ -DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb(QWidget* parent, const char* name, WFlags fl) - :DlgRef_2Sel3Spin2Rb_QTD(parent, name, fl) -{ - SpinBox1->close(TRUE); - SpinBox2->close(TRUE); - SpinBox3->close(TRUE); - RadioButton1->setChecked(true); - SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX"); - Layout2->addMultiCellWidget(SpinBox_DX, 0, 0, 2, 4); - SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY"); - Layout2->addWidget(SpinBox_DY, 1, 2); - SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ"); - Layout2->addWidget(SpinBox_DZ, 1, 4); - SpinBox_DY->setEnabled(false); - SpinBox_DZ->setEnabled(false); -} - -/* - * Destroys the object and frees any allocated resources - */ -DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb() -{ - // no need to delete child widgets, Qt does it all for us -} +// File : DlgRef_2Sel2Spin.cxx +// Author : Dmitry MATVEITCHEV +// Module : GEOM +// $Header: + +#include "DlgRef_2Sel3Spin2Rb.h" +#include + +#include +#include +#include +#include + +/* + * Constructs a DlgRef_2Sel3Spin2Rb which is a child of 'parent', with the + * name 'name' and widget flags set to 'f' + */ +DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb(QWidget* parent, const char* name, WFlags fl) + :DlgRef_2Sel3Spin2Rb_QTD(parent, name, fl) +{ + SpinBox1->close(TRUE); + SpinBox2->close(TRUE); + SpinBox3->close(TRUE); + RadioButton1->setChecked(true); + SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX"); + Layout2->addMultiCellWidget(SpinBox_DX, 0, 0, 2, 4); + SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY"); + Layout2->addWidget(SpinBox_DY, 1, 2); + SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ"); + Layout2->addWidget(SpinBox_DZ, 1, 4); + SpinBox_DY->setEnabled(false); + SpinBox_DZ->setEnabled(false); +} + +/* + * Destroys the object and frees any allocated resources + */ +DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb() +{ + // no need to delete child widgets, Qt does it all for us +} diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb.h b/src/DlgRef/DlgRef_2Sel3Spin2Rb.h index e651662f7..cc145fd79 100755 --- a/src/DlgRef/DlgRef_2Sel3Spin2Rb.h +++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb.h @@ -1,34 +1,27 @@ -// File : DlgRef_2Sel3Spin2Rb.h -// Author : Dmitry MATVEITCHEV -// Module : GEOM -// $Header: - -#ifndef DLGREF_2SEL3SPIN2RB_H -#define DLGREF_2SEL3SPIN2RB_H - -#include "DlgRef_2Sel3Spin2Rb_QTD.h" -#include "DlgRef_SpinBox.h" -//#if defined WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define DLGREF_WNT_EXPORT __declspec( dllexport ) -#else -#define DLGREF_WNT_EXPORT -#endif -class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD -{ - Q_OBJECT - -public: - DlgRef_2Sel3Spin2Rb(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); - ~DlgRef_2Sel3Spin2Rb(); - - DlgRef_SpinBox* SpinBox_DX; - DlgRef_SpinBox* SpinBox_DY; - DlgRef_SpinBox* SpinBox_DZ; -}; - -#endif // DLGREF_2SEL3SPIN2RB_H +// File : DlgRef_2Sel3Spin2Rb.h +// Author : Dmitry MATVEITCHEV +// Module : GEOM +// $Header: + +#ifndef DLGREF_2SEL3SPIN2RB_H +#define DLGREF_2SEL3SPIN2RB_H + +#include "GEOM_DlgRef.hxx" + +#include "DlgRef_2Sel3Spin2Rb_QTD.h" +#include "DlgRef_SpinBox.h" + +class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD +{ + Q_OBJECT + +public: + DlgRef_2Sel3Spin2Rb(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); + ~DlgRef_2Sel3Spin2Rb(); + + DlgRef_SpinBox* SpinBox_DX; + DlgRef_SpinBox* SpinBox_DY; + DlgRef_SpinBox* SpinBox_DZ; +}; + +#endif // DLGREF_2SEL3SPIN2RB_H diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h index 89f145aff..aedbcbb1d 100755 --- a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h +++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h @@ -10,6 +10,8 @@ #ifndef DLGREF_2SEL3SPIN2RB_QTD_H #define DLGREF_2SEL3SPIN2RB_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include @@ -24,7 +26,7 @@ class QLabel; class QRadioButton; class QSpinBox; -class DlgRef_2Sel3Spin2Rb_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin2Rb_QTD : public QWidget { Q_OBJECT diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 5bc00d051..a7e620041 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -58,8 +58,11 @@ #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +using namespace std; + static GEOM_Engine* TheEngine = NULL; + static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject) { TCollection_AsciiString anID(theObject->GetDocID()), anEntry; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx index fe9ed8e66..410b6608d 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx @@ -32,7 +32,6 @@ #include - class GEOMAlgo_FinderShapeOnQuad: public GEOMAlgo_FinderShapeOn1 { public: @@ -51,10 +50,10 @@ protected: private: - bool myConcaveQuad; - vector myConcaveSide; - vector myPoints; - vector myPlanes; - gp_Vec myQuadNormal; + bool myConcaveQuad; + std::vector myConcaveSide; + std::vector myPoints; + std::vector myPlanes; + gp_Vec myQuadNormal; }; #endif -- 2.39.2