ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-28 18:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merging with WPdev

Browse Source
This commit is contained in:
abd 2007-02-07 11:48:21 +00:00
parent fd7c28d483
commit 611ec94e27
488 changed files with 10714 additions and 6152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BREPExport/BREPExport.cxx
View File

@ -30,9 +30,21 @@
#include <TopoDS_Shape.hxx>
#ifdef WNT
#include <SALOME_WNT.hxx>
#if defined BREPEXPORT_EXPORTS
#if defined WIN32
#define BREPEXPORT_EXPORT __declspec( dllexport )
#else
#define SALOME_WNT_EXPORT
#define BREPEXPORT_EXPORT
#endif
#else
#if defined WIN32
#define BREPEXPORT_EXPORT __declspec( dllimport )
#else
#define BREPEXPORT_EXPORT
#endif
#endif
#else
#define BREPEXPORT_EXPORT
#endif
//=============================================================================
@ -43,10 +55,8 @@
extern "C"
{
SALOME_WNT_EXPORT
int Export(const TopoDS_Shape& theShape,
const TCollection_AsciiString& theFileName,
const TCollection_AsciiString& /*theFormatName*/)
BREPEXPORT_EXPORT
int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName)
{
MESSAGE("Export BREP into file " << theFileName.ToCString());

18
src/BREPImport/BREPImport.cxx
View File

@ -31,9 +31,21 @@
#include <TopoDS_Shape.hxx>
#ifdef WNT
#include <SALOME_WNT.hxx>
#if defined BREPIMPORT_EXPORTS
#if defined WIN32
#define BREPIMPORT_EXPORT __declspec( dllexport )
#else
#define SALOME_WNT_EXPORT
#define BREPIMPORT_EXPORT
#endif
#else
#if defined WIN32
#define BREPIMPORT_EXPORT __declspec( dllimport )
#else
#define BREPIMPORT_EXPORT
#endif
#endif
#else
#define BREPIMPORT_EXPORT
#endif
//=============================================================================
@ -44,7 +56,7 @@
extern "C"
{
SALOME_WNT_EXPORT
BREPIMPORT_EXPORT
TopoDS_Shape Import (const TCollection_AsciiString& theFileName,
const TCollection_AsciiString& /*theFormatName*/,
TCollection_AsciiString& theError)

4
src/BasicGUI/BasicGUI.cxx
View File

@ -207,9 +207,7 @@ gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView)
//=====================================================================================
extern "C"
{
#ifdef WNT
__declspec( dllexport )
#endif
GEOM_BASICGUI_EXPORT
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new BasicGUI( parent );

10
src/BasicGUI/BasicGUI.h
View File

@ -28,21 +28,17 @@
#ifndef BASICGUI_H
#define BASICGUI_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMGUI.h"
#include "GEOMBase.h"
#include <V3d_View.hxx>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI
// purpose :
//=================================================================================
class BasicGUI : public GEOMGUI
class GEOM_BASICGUI_EXPORT BasicGUI : public GEOMGUI
{
public:
BasicGUI( GeometryGUI* parent );

10
src/BasicGUI/BasicGUI_ArcDlg.h
View File

@ -28,18 +28,16 @@
#ifndef DIALOGBOX_ARC_H
#define DIALOGBOX_ARC_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_3Sel_QTD.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_ArcDlg
// purpose :
//=================================================================================
class BasicGUI_ArcDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_ArcDlg : public GEOMBase_Skeleton
{
Q_OBJECT

12
src/BasicGUI/BasicGUI_CircleDlg.h
View File

@ -28,25 +28,19 @@
#ifndef DIALOGBOX_CIRCLE_H
#define DIALOGBOX_CIRCLE_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel1Spin.h"
#include "DlgRef_3Sel_QTD.h"
#include "BasicGUI.h"
#include <gp_Dir.hxx>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_CircleDlg
// purpose :
//=================================================================================
class BasicGUI_CircleDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_CircleDlg : public GEOMBase_Skeleton
{
Q_OBJECT

10
src/BasicGUI/BasicGUI_CurveDlg.h
View File

@ -27,6 +27,8 @@
#ifndef BASICGUI_CURVE_H
#define BASICGUI_CURVE_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
@ -34,17 +36,11 @@
#include <list>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_CurveDlg
// purpose :
//=================================================================================
class BasicGUI_CurveDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_CurveDlg : public GEOMBase_Skeleton
{
Q_OBJECT

12
src/BasicGUI/BasicGUI_EllipseDlg.h
View File

@ -27,24 +27,18 @@
#ifndef BASICGUI_ELLIPSE_H
#define BASICGUI_ELLIPSE_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel2Spin.h"
#include "BasicGUI.h"
#include <gp_Dir.hxx>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_EllipseDlg
// purpose :
//=================================================================================
class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_EllipseDlg : public GEOMBase_Skeleton
{
Q_OBJECT

10
src/BasicGUI/BasicGUI_LineDlg.h
View File

@ -28,20 +28,16 @@
#ifndef DIALOGBOX_LINE_H
#define DIALOGBOX_LINE_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel_QTD.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_LineDlg
// purpose :
//=================================================================================
class BasicGUI_LineDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_LineDlg : public GEOMBase_Skeleton
{
Q_OBJECT

10
src/BasicGUI/BasicGUI_MarkerDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_Marker_H
#define DIALOGBOX_Marker_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
#include "DlgRef_3Sel_QTD.h"
@ -36,13 +38,7 @@
class DlgRef_SpinBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
class BasicGUI_MarkerDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_MarkerDlg : public GEOMBase_Skeleton
{
Q_OBJECT

10
src/BasicGUI/BasicGUI_PlaneDlg.h
View File

@ -28,22 +28,18 @@
#ifndef DIALOGBOX_PLANE_H
#define DIALOGBOX_PLANE_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Spin.h"
#include "DlgRef_2Sel1Spin.h"
#include "DlgRef_3Sel1Spin.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_PlaneDlg
// purpose :
//=================================================================================
class BasicGUI_PlaneDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_PlaneDlg : public GEOMBase_Skeleton
{
Q_OBJECT

9
src/BasicGUI/BasicGUI_PointDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_POINT_H
#define DIALOGBOX_POINT_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Spin.h"
#include "DlgRef_3Spin.h"
@ -36,16 +38,11 @@
class QLineEdit;
class QGroupBox;
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_PointDlg
// purpose :
//=================================================================================
class BasicGUI_PointDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_PointDlg : public GEOMBase_Skeleton
{
Q_OBJECT

10
src/BasicGUI/BasicGUI_VectorDlg.h
View File

@ -28,23 +28,19 @@
#ifndef DIALOGBOX_VECTOR_H
#define DIALOGBOX_VECTOR_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel_QTD.h"
#include "DlgRef_3Spin1Check.h"
#include "BasicGUI.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_VectorDlg
// purpose :
//=================================================================================
class BasicGUI_VectorDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_VectorDlg : public GEOMBase_Skeleton
{
Q_OBJECT

10
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
View File

@ -28,22 +28,18 @@
#ifndef DIALOGBOX_WORKINGPLANE_H
#define DIALOGBOX_WORKINGPLANE_H
#include "GEOM_BasicGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
#include "DlgRef_2Sel_QTD.h"
#include "DlgRef_3Check_QTD.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_WorkingPlaneDlg
// purpose :
//=================================================================================
class BASICGUI_WNT_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
class GEOM_BASICGUI_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
{
Q_OBJECT

6
src/BasicGUI/Makefile.in
View File

@ -35,7 +35,8 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
@COMMENCE@
# header files
EXPORT_HEADERS= BasicGUI_PointDlg.h
EXPORT_HEADERS= BasicGUI_PointDlg.h \
GEOM_BasicGUI.hxx
# Libraries targets
LIB = libBasicGUI.la
@ -62,7 +63,8 @@ LIB_MOC = \
BasicGUI_PlaneDlg.h \
BasicGUI_WorkingPlaneDlg.h \
BasicGUI_CurveDlg.h \
BasicGUI_MarkerDlg.h
BasicGUI_MarkerDlg.h \
GEOM_BasicGUI.hxx
LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl

4
src/BlocksGUI/BlocksGUI.cxx
View File

@ -91,9 +91,7 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
//=====================================================================================
extern "C"
{
#ifdef WNT
__declspec( dllexport )
#endif
GEOM_BLOCKSGUI_EXPORT
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new BlocksGUI( parent );

4
src/BlocksGUI/BlocksGUI.h
View File

@ -27,13 +27,15 @@
#ifndef BLOCKSGUI_H
#define BLOCKSGUI_H
#include "GEOM_BlocksGUI.hxx"
#include "GEOMGUI.h"
//=================================================================================
// class : BlocksGUI
// purpose :
//=================================================================================
class BlocksGUI : public GEOMGUI
class GEOM_BLOCKSGUI_EXPORT BlocksGUI : public GEOMGUI
{
public:
BlocksGUI( GeometryGUI* parent );

4
src/BlocksGUI/BlocksGUI_BlockDlg.h
View File

@ -27,6 +27,8 @@
#ifndef DIALOGBOX_BLOCK_H
#define DIALOGBOX_BLOCK_H
#include "GEOM_BlocksGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel_QTD.h"
#include "DlgRef_6Sel_QTD.h"
@ -36,7 +38,7 @@
// class : BlocksGUI_BlockDlg
// purpose :
//=================================================================================
class BlocksGUI_BlockDlg : public GEOMBase_Skeleton
class GEOM_BLOCKSGUI_EXPORT BlocksGUI_BlockDlg : public GEOMBase_Skeleton
{
Q_OBJECT

3
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -452,7 +452,8 @@ bool BlocksGUI_ExplodeDlg::execute (ObjectList& objects)
ObjectList toRemoveFromEnggine;
ObjectList::iterator anIter;
for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter) {
if (selected.contains(myGeomGUI->getApp()->orb()->object_to_string(*anIter)))
CORBA::String_var objStr = myGeomGUI->getApp()->orb()->object_to_string(*anIter);
if (selected.contains(QString(objStr.in())))
objects.push_back(*anIter);
else
toRemoveFromEnggine.push_back(*anIter);

4
src/BlocksGUI/BlocksGUI_ExplodeDlg.h
View File

@ -27,6 +27,8 @@
#ifndef DIALOGBOX_BLOCK_EXPLODE_H
#define DIALOGBOX_BLOCK_EXPLODE_H
#include "GEOM_BlocksGUI.hxx"
#include "GEOMBase_Skeleton.h"
class DlgRef_SpinBox;
@ -37,7 +39,7 @@ class QCheckBox;
// class : BlocksGUI_ExplodeDlg
// purpose :
//=================================================================================
class BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton
class GEOM_BLOCKSGUI_EXPORT BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BlocksGUI/BlocksGUI_PropagateDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_BlocksGUI_PropagateDlg_H
#define DIALOGBOX_BlocksGUI_PropagateDlg_H
#include "GEOM_BlocksGUI.hxx"
#include "GEOMBase_Skeleton.h"
@ -35,7 +37,7 @@
// class : BlocksGUI_PropagateDlg
// purpose :
//=================================================================================
class BlocksGUI_PropagateDlg : public GEOMBase_Skeleton
class GEOM_BLOCKSGUI_EXPORT BlocksGUI_PropagateDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
View File

@ -27,13 +27,15 @@
#ifndef DIALOGBOX_QUAD_FACE_H
#define DIALOGBOX_QUAD_FACE_H
#include "GEOM_BlocksGUI.hxx"
#include "GEOMBase_Skeleton.h"
//=================================================================================
// class : BlocksGUI_QuadFaceDlg
// purpose :
//=================================================================================
class BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton
class GEOM_BLOCKSGUI_EXPORT BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BlocksGUI/BlocksGUI_TrsfDlg.h
View File

@ -27,6 +27,8 @@
#ifndef DIALOGBOX_BLOCK_MULTITRSF_H
#define DIALOGBOX_BLOCK_MULTITRSF_H
#include "GEOM_BlocksGUI.hxx"
#include "GEOMBase_Skeleton.h"
class DlgRef_SpinBox;
@ -35,7 +37,7 @@ class DlgRef_SpinBox;
// class : BlocksGUI_TrsfDlg
// purpose :
//=================================================================================
class BlocksGUI_TrsfDlg : public GEOMBase_Skeleton
class GEOM_BLOCKSGUI_EXPORT BlocksGUI_TrsfDlg : public GEOMBase_Skeleton
{
Q_OBJECT

3
src/BlocksGUI/Makefile.in
View File

@ -52,7 +52,8 @@ LIB_MOC = \
BlocksGUI_BlockDlg.h \
BlocksGUI_ExplodeDlg.h \
BlocksGUI_PropagateDlg.h \
BlocksGUI_TrsfDlg.h
BlocksGUI_TrsfDlg.h \
GEOM_BlocksGUI.hxx
LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl

4
src/BooleanGUI/BooleanGUI.cxx
View File

@ -84,9 +84,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
//=====================================================================================
extern "C"
{
#ifdef WNT
__declspec( dllexport )
#endif
GEOM_BOOLEANGUI_EXPORT
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new BooleanGUI( parent );

20
src/BooleanGUI/BooleanGUI.h
View File

@ -30,11 +30,29 @@
#include "GEOMGUI.h"
#ifdef WNT
#if defined BOOLEANGUI_EXPORTS
#if defined WIN32
#define GEOM_BOOLEANGUI_EXPORT __declspec( dllexport )
#else
#define GEOM_BOOLEANGUI_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_BOOLEANGUI_EXPORT __declspec( dllimport )
#else
#define GEOM_BOOLEANGUI_EXPORT
#endif
#endif
#else
#define GEOM_BOOLEANGUI_EXPORT
#endif
//=================================================================================
// class : BooleanGUI
// purpose :
//=================================================================================
class BooleanGUI : public GEOMGUI
class GEOM_BOOLEANGUI_EXPORT BooleanGUI : public GEOMGUI
{
public:
enum BooleanOperation { COMMON = 1, CUT = 2, FUSE = 3, SECTION = 4 };

4
src/BooleanGUI/BooleanGUI_Dialog.h
View File

@ -28,6 +28,8 @@
#ifndef BooleanGUI_Dialog_H
#define BooleanGUI_Dialog_H
#include "BooleanGUI.h" //for wnt defines
#include "GEOMBase_Skeleton.h"
class DlgRef_2Sel_QTD;
@ -36,7 +38,7 @@ class DlgRef_2Sel_QTD;
// class : BooleanGUI_Dialog
// purpose :
//=================================================================================
class BooleanGUI_Dialog : public GEOMBase_Skeleton
class GEOM_BOOLEANGUI_EXPORT BooleanGUI_Dialog : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BuildGUI/BuildGUI.cxx
View File

@ -95,9 +95,7 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
//=====================================================================================
extern "C"
{
#ifdef WNT
__declspec( dllexport )
#endif
GEOM_BUILDGUI_EXPORT
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new BuildGUI( parent );

4
src/BuildGUI/BuildGUI.h
View File

@ -28,13 +28,15 @@
#ifndef BUILDGUI_H
#define BUILDGUI_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMGUI.h"
//=================================================================================
// class : BuildGUI
// purpose :
//=================================================================================
class BuildGUI : public GEOMGUI
class GEOM_BUILDGUI_EXPORT BuildGUI : public GEOMGUI
{
public :
BuildGUI( GeometryGUI* parent );

4
src/BuildGUI/BuildGUI_CompoundDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_COMPOUND_H
#define DIALOGBOX_COMPOUND_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
@ -35,7 +37,7 @@
// class : BuildGUI_CompoundDlg
// purpose :
//=================================================================================
class BuildGUI_CompoundDlg : public GEOMBase_Skeleton
class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BuildGUI/BuildGUI_EdgeDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_EDGE_H
#define DIALOGBOX_EDGE_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_2Sel_QTD.h"
@ -35,7 +37,7 @@
// class : BuildGUI_EdgeDlg
// purpose :
//=================================================================================
class BuildGUI_EdgeDlg : public GEOMBase_Skeleton
class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton
{
Q_OBJECT

21
src/BuildGUI/BuildGUI_FaceDlg.cxx
View File

@ -28,6 +28,7 @@
#include "BuildGUI_FaceDlg.h"
#include "GEOMImpl_Types.hxx"
#include "TColStd_MapOfInteger.hxx"
#include "SUIT_Session.h"
#include "SalomeApp_Application.h"
@ -64,7 +65,7 @@ BuildGUI_FaceDlg::BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
GroupWire = new DlgRef_1Sel1Check_QTD(this, "GroupWire");
GroupWire->GroupBox1->setTitle(tr("GEOM_FACE_FFW"));
GroupWire->TextLabel1->setText(tr("GEOM_WIRES"));
GroupWire->TextLabel1->setText(tr("GEOM_OBJECTS"));
GroupWire->CheckButton1->setText(tr("GEOM_FACE_OPT"));
GroupWire->PushButton1->setPixmap(image1);
@ -100,7 +101,10 @@ void BuildGUI_FaceDlg::Init()
GroupWire->CheckButton1->setChecked(TRUE);
globalSelection( GEOM_WIRE );
TColStd_MapOfInteger aMap;
aMap.Add( GEOM_EDGE );
aMap.Add( GEOM_WIRE );
globalSelection( aMap );
/* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
@ -160,7 +164,7 @@ void BuildGUI_FaceDlg::SelectionIntoArgument()
if (!myWires.length())
return;
if(aNbSel != 1)
aName = tr("%1_wires").arg(aNbSel);
aName = tr("%1_objects").arg(aNbSel);
myEditCurrentArgument->setText( aName );
@ -178,7 +182,11 @@ void BuildGUI_FaceDlg::SetEditCurrentArgument()
if (send != GroupWire->PushButton1)
return;
globalSelection( GEOM_WIRE );
TColStd_MapOfInteger aMap;
aMap.Add( GEOM_EDGE );
aMap.Add( GEOM_WIRE );
globalSelection( aMap );
myEditCurrentArgument = GroupWire->LineEdit1;
myEditCurrentArgument->setFocus();
@ -195,7 +203,10 @@ void BuildGUI_FaceDlg::ActivateThisDialog()
GEOMBase_Skeleton::ActivateThisDialog();
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
globalSelection( GEOM_WIRE );
TColStd_MapOfInteger aMap;
aMap.Add( GEOM_EDGE );
aMap.Add( GEOM_WIRE );
globalSelection( aMap );
}

4
src/BuildGUI/BuildGUI_FaceDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_FACE_H
#define DIALOGBOX_FACE_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check_QTD.h"
@ -35,7 +37,7 @@
// class : BuildGUI_FaceDlg
// purpose :
//=================================================================================
class BuildGUI_FaceDlg : public GEOMBase_Skeleton
class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BuildGUI/BuildGUI_ShellDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_SHELL_H
#define DIALOGBOX_SHELL_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
@ -35,7 +37,7 @@
// class : BuildGUI_ShellDlg
// purpose :
//=================================================================================
class BuildGUI_ShellDlg : public GEOMBase_Skeleton
class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BuildGUI/BuildGUI_SolidDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_SOLID_H
#define DIALOGBOX_SOLID_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel1Check_QTD.h"
@ -35,7 +37,7 @@
// class : BuildGUI_SolidDlg
// purpose :
//=================================================================================
class BuildGUI_SolidDlg : public GEOMBase_Skeleton
class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton
{
Q_OBJECT

4
src/BuildGUI/BuildGUI_WireDlg.h
View File

@ -28,6 +28,8 @@
#ifndef DIALOGBOX_WIRE_H
#define DIALOGBOX_WIRE_H
#include "GEOM_BuildGUI.hxx"
#include "GEOMBase_Skeleton.h"
#include "DlgRef_1Sel_QTD.h"
@ -35,7 +37,7 @@
// class : BuildGUI_WireDlg
// purpose :
//=================================================================================
class BuildGUI_WireDlg : public GEOMBase_Skeleton
class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton
{
Q_OBJECT

3
src/BuildGUI/Makefile.in
View File

@ -54,7 +54,8 @@ LIB_MOC = \
BuildGUI_FaceDlg.h \
BuildGUI_ShellDlg.h \
BuildGUI_SolidDlg.h \
BuildGUI_CompoundDlg.h
BuildGUI_CompoundDlg.h \
GEOM_BuildGUI.hxx
LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl

4
src/DisplayGUI/DisplayGUI.cxx
View File

@ -470,9 +470,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
//=====================================================================================
extern "C"
{
#ifdef WNT
__declspec( dllexport )
#endif
GEOM_DISPLAYGUI_EXPORT
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new DisplayGUI( parent );

12
src/DisplayGUI/DisplayGUI.h
View File

@ -31,10 +31,14 @@
#include "GEOMGUI.h"
#include "GEOMBase.h"
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DISPLAYGUI_WNT_EXPORT __declspec( dllexport )
#ifdef WNT
# if defined DISPLAYGUI_EXPORTS
# define GEOM_DISPLAYGUI_EXPORT __declspec( dllexport )
# else
#define DISPLAYGUI_WNT_EXPORT
# define GEOM_DISPLAYGUI_EXPORT __declspec( dllimport )
# endif
#else
# define GEOM_DISPLAYGUI_EXPORT
#endif
//=================================================================================
@ -43,7 +47,7 @@
//=================================================================================
//class QAD_ViewFrame;
class SUIT_ViewWindow;
class DisplayGUI : public GEOMGUI
class GEOM_DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI
{
public:
DisplayGUI( GeometryGUI* parent );

10
src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1LIST1SPIN1BTN_QTD_H
#define DLGREF_1LIST1SPIN1BTN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,13 +42,7 @@ class QListViewItem;
class QPushButton;
class QSpinBox;
#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_1List1Spin1Btn_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1List1Spin1Btn_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel1Check1List_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1CHECK1LIST_QTD_H
#define DLGREF_1SEL1CHECK1LIST_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,13 +42,7 @@ class QLineEdit;
class QPushButton;
class QRadioButton;
#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_1Sel1Check1List_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check1List_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1CHECK_QTD_H
#define DLGREF_1SEL1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,13 +41,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
#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_1Sel1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check_QTD : public QWidget
{
Q_OBJECT

14
src/DlgRef/DlgRef_1Sel1Spin.h
View File

@ -29,20 +29,12 @@
#ifndef DLGREF_1SEL1SPIN_H
#define DLGREF_1SEL1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel1Spin_QTD.h"
#include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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_1Sel1Spin : public DlgRef_1Sel1Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel1Spin1Check.h
View File

@ -29,16 +29,12 @@
#ifndef DLGREF_1SEL1SPIN1CHECK_H
#define DLGREF_1SEL1SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel1Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1SPIN1CHECK_QTD_H
#define DLGREF_1SEL1SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_1Sel1Spin1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel1Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL1SPIN_QTD_H
#define DLGREF_1SEL1SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,12 +40,8 @@ class QLabel;
class QLineEdit;
class QPushButton;
class QSpinBox;
#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_1Sel1Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin_QTD : public QWidget
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel2Spin.h
View File

@ -29,10 +29,12 @@
#ifndef DLGREF_1SEL2SPIN_H
#define DLGREF_1SEL2SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel2Spin_QTD.h"
#include "DlgRef_SpinBox.h"
class DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel2Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL2SPIN_QTD_H
#define DLGREF_1SEL2SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,7 +41,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_1Sel2Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin_QTD : public QWidget
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel3Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL3CHECK_QTD_H
#define DLGREF_1SEL3CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,7 +41,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
class DlgRef_1Sel3Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel3Check_QTD : public QWidget
{
Q_OBJECT

15
src/DlgRef/DlgRef_1Sel3Spin.h
View File

@ -29,21 +29,12 @@
#ifndef DLGREF_1SEL3SPIN_H
#define DLGREF_1SEL3SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel3Spin_QTD.h"
#include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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_1Sel3Spin : public DlgRef_1Sel3Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel3Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL3SPIN_QTD_H
#define DLGREF_1SEL3SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,12 +40,8 @@ class QLabel;
class QLineEdit;
class QPushButton;
class QSpinBox;
#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_1Sel3Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin_QTD : public QWidget
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel4Spin.h
View File

@ -29,10 +29,12 @@
#ifndef DLGREF_1SEL4SPIN_H
#define DLGREF_1SEL4SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel4Spin_QTD.h"
#include "DlgRef_SpinBox.h"
class DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel4Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL4SPIN_QTD_H
#define DLGREF_1SEL4SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,7 +41,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_1Sel4Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel5Spin.h
View File

@ -29,16 +29,12 @@
#ifndef DLGREF_1SEL5SPIN_H
#define DLGREF_1SEL5SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel5Spin_QTD.h"
#include "DlgRef_SpinBox.h"
#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_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_1Sel5Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL5SPIN_QTD_H
#define DLGREF_1SEL5SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,7 +41,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_1Sel5Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel_Ext.h
View File

@ -28,17 +28,13 @@
#ifndef DlgRef_1Sel_Ext_H
#define DlgRef_1Sel_Ext_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Sel_QTD.h"
class QGridLayout;
#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_1Sel_Ext : public DlgRef_1Sel_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Sel_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SEL_QTD_H
#define DLGREF_1SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
#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_1Sel_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Sel_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Spin.h
View File

@ -29,14 +29,12 @@
#ifndef DLGREF_1SPIN_H
#define DLGREF_1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_1Spin_QTD.h"
#include "DlgRef_SpinBox.h"
#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_1Spin : public DlgRef_1Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_1Spin : public DlgRef_1Spin_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_1Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_1SPIN_QTD_H
#define DLGREF_1SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -36,12 +38,8 @@ class QGridLayout;
class QGroupBox;
class QLabel;
class QSpinBox;
#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_1Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_1Spin_QTD : public QWidget
{
Q_OBJECT

14
src/DlgRef/DlgRef_2Sel1Spin.h
View File

@ -29,20 +29,12 @@
#ifndef DLGREF_2SEL1SPIN_H
#define DLGREF_2SEL1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel1Spin_QTD.h"
#include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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_2Sel1Spin : public DlgRef_2Sel1Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD
{
Q_OBJECT

9
src/DlgRef/DlgRef_2Sel1Spin2Check.h
View File

@ -29,15 +29,12 @@
#ifndef DLGREF_2SEL1SPIN2CHECK_H
#define DLGREF_2SEL1SPIN2CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel1Spin2Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL1SPIN2CHECK_QTD_H
#define DLGREF_2SEL1SPIN2CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_2Sel1Spin2Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Sel1Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL1SPIN_QTD_H
#define DLGREF_2SEL1SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,13 +41,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
#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_2Sel1Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin_QTD : public QWidget
{
Q_OBJECT

15
src/DlgRef/DlgRef_2Sel2Spin.h
View File

@ -29,19 +29,12 @@
#ifndef DLGREF_2SEL2SPIN_H
#define DLGREF_2SEL2SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel2Spin_QTD.h"
#include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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_2Sel2Spin : public DlgRef_2Sel2Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Sel2Spin1Check.h
View File

@ -29,16 +29,12 @@
#ifndef DLGREF_2SEL2SPIN1CHECK_H
#define DLGREF_2SEL2SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel2Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL2SPIN1CHECK_QTD_H
#define DLGREF_2SEL2SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_2Sel2Spin1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Sel2Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL2SPIN_QTD_H
#define DLGREF_2SEL2SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,13 +41,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
#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_2Sel2Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Sel3Spin.h
View File

@ -29,16 +29,12 @@
#ifndef DLGREF_2SEL3SPIN_H
#define DLGREF_2SEL3SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel3Spin_QTD.h"
#include "DlgRef_SpinBox.h"
#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_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Sel3Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL3SPIN_QTD_H
#define DLGREF_2SEL3SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,12 +40,8 @@ class QLabel;
class QLineEdit;
class QPushButton;
class QSpinBox;
#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_2Sel3Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin_QTD : public QWidget
{
Q_OBJECT

9
src/DlgRef/DlgRef_2Sel4Spin1Check.h
View File

@ -29,16 +29,13 @@
#ifndef DLGREF_2SEL4SPIN1CHECK_H
#define DLGREF_2SEL4SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel4Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL4SPIN1CHECK_QTD_H
#define DLGREF_2SEL4SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_2Sel4Spin1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Sel_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SEL_QTD_H
#define DLGREF_2SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
#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_2Sel_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Sel_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Spin.h
View File

@ -31,12 +31,10 @@
#include "DlgRef_2Spin_QTD.h"
#include "DlgRef_SpinBox.h"
#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_2Spin : public DlgRef_2Spin_QTD
#include "GEOM_DlgRef.hxx"
class GEOM_DLGREF_EXPORT DlgRef_2Spin : public DlgRef_2Spin_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_2Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_2SPIN_QTD_H
#define DLGREF_2SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -36,12 +38,8 @@ class QGridLayout;
class QGroupBox;
class QLabel;
class QSpinBox;
#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_2Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_2Spin_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_3Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3CHECK_QTD_H
#define DLGREF_3CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -36,13 +38,7 @@ class QGridLayout;
class QButtonGroup;
class QRadioButton;
#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_3Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_3Check_QTD : public QWidget
{
Q_OBJECT

15
src/DlgRef/DlgRef_3Sel1Spin.h
View File

@ -29,25 +29,18 @@
#ifndef DlgRef_3SEL_1SPIN_H
#define DlgRef_3SEL_1SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Sel_QTD.h"
#include "DlgRef_SpinBox.h"
#include <qlayout.h>
#include <qlabel.h>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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_3Sel1Spin
// purpose : extension of a DlgRef_3Sel_QTD class, 1 additional spin box is added
//=================================================================================
class DLGREF_WNT_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD
class GEOM_DLGREF_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_3Sel3Spin1Check.h
View File

@ -29,16 +29,12 @@
#ifndef DLGREF_3SEL3SPIN1CHECK_H
#define DLGREF_3SEL3SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Sel3Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SEL3SPIN1CHECK_QTD_H
#define DLGREF_3SEL3SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_3Sel3Spin1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_3Sel4Spin2Check.h
View File

@ -29,16 +29,12 @@
#ifndef DLGREF_3SEL4SPIN2CHECK_H
#define DLGREF_3SEL4SPIN2CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Sel4Spin2Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
{
Q_OBJECT

4
src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SEL4SPIN2CHECK_QTD_H
#define DLGREF_3SEL4SPIN2CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -40,7 +42,7 @@ class QLineEdit;
class QPushButton;
class QSpinBox;
class DlgRef_3Sel4Spin2Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_3Sel_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SEL_QTD_H
#define DLGREF_3SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
#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_3Sel_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_3Sel_QTD : public QWidget
{
Q_OBJECT

15
src/DlgRef/DlgRef_3Spin.h
View File

@ -29,19 +29,12 @@
#ifndef DLGREF_3SPIN_H
#define DLGREF_3SPIN_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Spin_QTD.h"
#include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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_3Spin : public DlgRef_3Spin_QTD
class GEOM_DLGREF_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD
{
Q_OBJECT

9
src/DlgRef/DlgRef_3Spin1Check.h
View File

@ -29,15 +29,12 @@
#ifndef DLGREF_3SPIN1CHECK_H
#define DLGREF_3SPIN1CHECK_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_3Spin1Check_QTD.h"
#include "DlgRef_SpinBox.h"
#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_3Spin1Check : public DlgRef_3Spin1Check_QTD
class GEOM_DLGREF_EXPORT DlgRef_3Spin1Check : public DlgRef_3Spin1Check_QTD
{
Q_OBJECT

10
src/DlgRef/DlgRef_3Spin1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SPIN1CHECK_QTD_H
#define DLGREF_3SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QRadioButton;
class QSpinBox;
#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_3Spin1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_3Spin1Check_QTD : public QWidget
{
Q_OBJECT

9
src/DlgRef/DlgRef_3Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_3SPIN_QTD_H
#define DLGREF_3SPIN_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -37,12 +39,7 @@ class QGroupBox;
class QLabel;
class QSpinBox;
#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_3Spin_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_3Spin_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_4Sel1List1Check_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_4SEL1LIST1CHECK_QTD_H
#define DLGREF_4SEL1LIST1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -41,13 +43,7 @@ class QPushButton;
class QCheckBox;
class QPushButton;
#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_4Sel1List1Check_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_4Sel1List1Check_QTD : public QWidget
{
Q_OBJECT

4
src/DlgRef/DlgRef_4Sel1List_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_4SEL1LIST_QTD_H
#define DLGREF_4SEL1LIST_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -39,7 +41,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
class DlgRef_4Sel1List_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_4Sel1List_QTD : public QWidget
{
Q_OBJECT

10
src/DlgRef/DlgRef_6Sel_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef DLGREF_6SEL_QTD_H
#define DLGREF_6SEL_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,13 +40,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
#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_6Sel_QTD : public QWidget
class GEOM_DLGREF_EXPORT DlgRef_6Sel_QTD : public QWidget
{
Q_OBJECT

4
src/DlgRef/DlgRef_Skeleton_QTD.h
View File

@ -29,6 +29,8 @@
#ifndef DLGREF_SKELETON_QTD_H
#define DLGREF_SKELETON_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qdialog.h>
@ -43,7 +45,7 @@ class QRadioButton;
class QLineEdit;
class QLabel;
class DlgRef_Skeleton_QTD : public QDialog
class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
{
Q_OBJECT

14
src/DlgRef/DlgRef_SpinBox.h
View File

@ -29,17 +29,9 @@
#ifndef GEOMSPINBOX_H
#define GEOMSPINBOX_H
#include "GEOM_DlgRef.hxx"
#include "QtxDblSpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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
#define COORD_MIN -1e+15
#define COORD_MAX +1e+15
@ -49,7 +41,7 @@
// class : DlgRef_SpinBox
// purpose : Derivated from QSpinBox class and modified to accept floats
//=================================================================================
class DLGREF_WNT_EXPORT DlgRef_SpinBox : public QtxDblSpinBox
class GEOM_DLGREF_EXPORT DlgRef_SpinBox : public QtxDblSpinBox
{
Q_OBJECT

13
src/DlgRef/Makefile.in
View File

@ -58,6 +58,7 @@ LIB_SRC = DlgRef_Skeleton_QTD.cxx \
DlgRef_2Sel4Spin1Check_QTD.cxx \
DlgRef_3Sel4Spin2Check_QTD.cxx \
DlgRef_4Sel1List_QTD.cxx \
DlgRef_2Sel1List_QTD.cxx \
DlgRef_1List1Spin1Btn_QTD.cxx \
DlgRef_4Sel1List1Check_QTD.cxx \
DlgRef_1Spin_QTD.cxx \
@ -65,6 +66,7 @@ LIB_SRC = DlgRef_Skeleton_QTD.cxx \
DlgRef_3Spin_QTD.cxx \
DlgRef_3Spin1Check_QTD.cxx \
DlgRef_3Sel3Spin1Check_QTD.cxx \
DlgRef_4Sel1Spin2Check_QTD.cxx \
DlgRef_SpinBox.cxx \
DlgRef_1Sel1Spin.cxx \
DlgRef_1Sel2Spin.cxx \
@ -86,7 +88,8 @@ LIB_SRC = DlgRef_Skeleton_QTD.cxx \
DlgRef_3Spin1Check.cxx \
DlgRef_3Sel1Spin.cxx \
DlgRef_3Check_QTD.cxx \
DlgRef_6Sel_QTD.cxx
DlgRef_6Sel_QTD.cxx \
DlgRef_4Sel1Spin2Check.cxx
LIB_MOC = \
DlgRef_Skeleton_QTD.h \
@ -110,6 +113,7 @@ LIB_MOC = \
DlgRef_2Sel4Spin1Check_QTD.h \
DlgRef_3Sel4Spin2Check_QTD.h \
DlgRef_4Sel1List_QTD.h \
DlgRef_2Sel1List_QTD.h \
DlgRef_1List1Spin1Btn_QTD.h \
DlgRef_4Sel1List1Check_QTD.h \
DlgRef_1Spin_QTD.h \
@ -117,6 +121,7 @@ LIB_MOC = \
DlgRef_3Spin_QTD.h \
DlgRef_3Spin1Check_QTD.h \
DlgRef_3Sel3Spin1Check_QTD.h \
DlgRef_4Sel1Spin2Check_QTD.h \
DlgRef_SpinBox.h \
DlgRef_1Sel1Spin.h \
DlgRef_1Sel2Spin.h \
@ -139,10 +144,12 @@ LIB_MOC = \
DlgRef_3Sel1Spin.h \
DlgRef_1Sel_Ext.h \
DlgRef_3Check_QTD.h \
DlgRef_6Sel_QTD.h
DlgRef_6Sel_QTD.h \
DlgRef_4Sel1Spin2Check.h
# header files
EXPORT_HEADERS= $(LIB_MOC)
EXPORT_HEADERS= $(LIB_MOC) \
GEOM_DlgRef.hxx
LIB_CLIENT_IDL =

10
src/DlgRef/UIFiles/ui_to_cxx
View File

@ -14,8 +14,7 @@
# 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
@ -100,5 +99,8 @@
#uic -o DlgRef_6Sel_QTD.h DlgRef_6Sel_QTD.ui
#uic -o DlgRef_6Sel_QTD.cxx -impl DlgRef_6Sel_QTD.h DlgRef_6Sel_QTD.ui
uic -o DlgRef_3Check_QTD.h DlgRef_3Check_QTD.ui
uic -o DlgRef_3Check_QTD.cxx -impl DlgRef_3Check_QTD.h DlgRef_3Check_QTD.ui
#uic -o DlgRef_3Check_QTD.h DlgRef_3Check_QTD.ui
#uic -o DlgRef_3Check_QTD.cxx -impl DlgRef_3Check_QTD.h DlgRef_3Check_QTD.ui
uic -o DlgRef_4Sel1Spin2Check_QTD.h DlgRef_4Sel1Spin2Check_QTD.ui
uic -o DlgRef_4Sel1Spin2Check_QTD.cxx -impl DlgRef_4Sel1Spin2Check_QTD.h DlgRef_4Sel1Spin2Check_QTD.ui

4
src/EntityGUI/EntityGUI.cxx
View File

@ -221,9 +221,7 @@ bool EntityGUI::SObjectExist(const _PTR(SObject)& theFatherObject, const char* I
//=====================================================================================
extern "C"
{
#ifdef WNT
__declspec( dllexport )
#endif
GEOM_ENTITYGUI_EXPORT
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new EntityGUI( parent );

4
src/EntityGUI/EntityGUI.h
View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_H
#define ENTITYGUI_H
#include "GEOM_EntityGUI.hxx"
#include "GEOMGUI.h"
#include "SALOMEDSClient.hxx"
@ -39,7 +41,7 @@
// class : EntityGUI
// purpose :
//=================================================================================
class EntityGUI : public GEOMGUI
class GEOM_ENTITYGUI_EXPORT EntityGUI : public GEOMGUI
{
public :
EntityGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation

4
src/EntityGUI/EntityGUI_1Sel_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_1SEL_QTD_H
#define ENTITYGUI_1SEL_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QLineEdit;
class QPushButton;
class EntityGUI_1Sel_QTD : public QWidget
class GEOM_ENTITYGUI_EXPORT EntityGUI_1Sel_QTD : public QWidget
{
Q_OBJECT

4
src/EntityGUI/EntityGUI_1Spin.h
View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_1SPIN_H
#define ENTITYGUI_1SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_1Spin_QTD.h"
#include "DlgRef_SpinBox.h"
class EntityGUI_1Spin : public EntityGUI_1Spin_QTD
class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public EntityGUI_1Spin_QTD
{
Q_OBJECT

4
src/EntityGUI/EntityGUI_1Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_1SPIN_QTD_H
#define ENTITYGUI_1SPIN_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QPushButton;
class QSpinBox;
class EntityGUI_1Spin_QTD : public QWidget
class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin_QTD : public QWidget
{
Q_OBJECT

4
src/EntityGUI/EntityGUI_2Spin.h
View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_2SPIN_H
#define ENTITYGUI_2SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_2Spin_QTD.h"
#include "DlgRef_SpinBox.h"
class EntityGUI_2Spin : public EntityGUI_2Spin_QTD
class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public EntityGUI_2Spin_QTD
{
Q_OBJECT

4
src/EntityGUI/EntityGUI_2Spin_QTD.h
View File

@ -28,6 +28,8 @@
#ifndef ENTITYGUI_2SPIN_QTD_H
#define ENTITYGUI_2SPIN_QTD_H
#include "GEOM_EntityGUI.hxx"
#include <qvariant.h>
#include <qwidget.h>
class QVBoxLayout;
@ -38,7 +40,7 @@ class QLabel;
class QPushButton;
class QSpinBox;
class EntityGUI_2Spin_QTD : public QWidget
class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin_QTD : public QWidget
{
Q_OBJECT

4
src/EntityGUI/EntityGUI_3Spin.h
View File

@ -29,10 +29,12 @@
#ifndef ENTITYGUI_3SPIN_H
#define ENTITYGUI_3SPIN_H
#include "GEOM_EntityGUI.hxx"
#include "EntityGUI_3Spin_QTD.h"
#include "DlgRef_SpinBox.h"
class EntityGUI_3Spin : public EntityGUI_3Spin_QTD
class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public EntityGUI_3Spin_QTD
{
Q_OBJECT

Some files were not shown because too many files have changed in this diff Show More