ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-01 04:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
vsr 2007-10-15 12:19:01 +00:00
parent e955dc7400
commit 8abcb7d156
23 changed files with 228 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BasicGUI/BasicGUI.cxx
View File

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

8
src/BasicGUI/BasicGUI.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_H #ifndef BASICGUI_H
#define BASICGUI_H #define BASICGUI_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMGUI.h> #include <GEOMGUI.h>
#include <V3d_View.hxx> #include <V3d_View.hxx>
@ -35,14 +33,14 @@
// class : BasicGUI // class : BasicGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI : public GEOMGUI class BasicGUI : public GEOMGUI
{ {
public: public:
BasicGUI( GeometryGUI* ); BasicGUI( GeometryGUI* );
~BasicGUI(); ~BasicGUI();
bool OnGUIEvent( int, SUIT_Desktop* ); bool OnGUIEvent( int, SUIT_Desktop* );
bool OnMousePress( QMouseEvent*, SUIT_Desktop*, SUIT_ViewWindow* ); bool OnMousePress( QMouseEvent*, SUIT_Desktop*, SUIT_ViewWindow* );
gp_Pnt ConvertClickToPoint( int, int, Handle(V3d_View) ); gp_Pnt ConvertClickToPoint( int, int, Handle(V3d_View) );
}; };

4
src/BasicGUI/BasicGUI_ArcDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_ARCDLG_H #ifndef BASICGUI_ARCDLG_H
#define BASICGUI_ARCDLG_H #define BASICGUI_ARCDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_3Sel; class DlgRef_3Sel;
@ -37,7 +35,7 @@ class DlgRef_3Sel1Check;
// class : BasicGUI_ArcDlg // class : BasicGUI_ArcDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_ArcDlg : public GEOMBase_Skeleton class BasicGUI_ArcDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_CircleDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_CIRCLEDLG_H #ifndef BASICGUI_CIRCLEDLG_H
#define BASICGUI_CIRCLEDLG_H #define BASICGUI_CIRCLEDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_3Sel; class DlgRef_3Sel;
@ -37,7 +35,7 @@ class DlgRef_2Sel1Spin;
// class : BasicGUI_CircleDlg // class : BasicGUI_CircleDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_CircleDlg : public GEOMBase_Skeleton class BasicGUI_CircleDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_CurveDlg.h
View File

@ -25,8 +25,6 @@
#ifndef BASICGUI_CURVEDLG_H #ifndef BASICGUI_CURVEDLG_H
#define BASICGUI_CURVEDLG_H #define BASICGUI_CURVEDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <list> #include <list>
@ -37,7 +35,7 @@ class DlgRef_1Sel;
// class : BasicGUI_CurveDlg // class : BasicGUI_CurveDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_CurveDlg : public GEOMBase_Skeleton class BasicGUI_CurveDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_EllipseDlg.h
View File

@ -25,8 +25,6 @@
#ifndef BASICGUI_ELLIPSEDLG_H #ifndef BASICGUI_ELLIPSEDLG_H
#define BASICGUI_ELLIPSEDLG_H #define BASICGUI_ELLIPSEDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_2Sel2Spin; class DlgRef_2Sel2Spin;
@ -35,7 +33,7 @@ class DlgRef_2Sel2Spin;
// class : BasicGUI_EllipseDlg // class : BasicGUI_EllipseDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_EllipseDlg : public GEOMBase_Skeleton class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_LineDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_LINEDLG_H #ifndef BASICGUI_LINEDLG_H
#define BASICGUI_LINEDLG_H #define BASICGUI_LINEDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_2Sel; class DlgRef_2Sel;
@ -36,7 +34,7 @@ class DlgRef_2Sel;
// class : BasicGUI_LineDlg // class : BasicGUI_LineDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_LineDlg : public GEOMBase_Skeleton class BasicGUI_LineDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_MarkerDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_MARKERDLG_H #ifndef BASICGUI_MARKERDLG_H
#define BASICGUI_MARKERDLG_H #define BASICGUI_MARKERDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <QMap> #include <QMap>
@ -37,7 +35,7 @@ class DlgRef_3Sel;
class QDoubleSpinBox; class QDoubleSpinBox;
class QFrame; class QFrame;
class BASICGUI_EXPORT BasicGUI_MarkerDlg : public GEOMBase_Skeleton class BasicGUI_MarkerDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_PlaneDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_PLANEDLG_H #ifndef BASICGUI_PLANEDLG_H
#define BASICGUI_PLANEDLG_H #define BASICGUI_PLANEDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_1Sel1Spin; class DlgRef_1Sel1Spin;
@ -38,7 +36,7 @@ class DlgRef_3Sel1Spin;
// class : BasicGUI_PlaneDlg // class : BasicGUI_PlaneDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_PlaneDlg : public GEOMBase_Skeleton class BasicGUI_PlaneDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_PointDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_POINTDLG_H #ifndef BASICGUI_POINTDLG_H
#define BASICGUI_POINTDLG_H #define BASICGUI_POINTDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_1Sel1Spin; class DlgRef_1Sel1Spin;
@ -43,7 +41,7 @@ class gp_Pnt;
// class : BasicGUI_PointDlg // class : BasicGUI_PointDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_PointDlg : public GEOMBase_Skeleton class BasicGUI_PointDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_VectorDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_VECTORDLG_H #ifndef BASICGUI_VECTORDLG_H
#define BASICGUI_VECTORDLG_H #define BASICGUI_VECTORDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
class DlgRef_2Sel; class DlgRef_2Sel;
@ -37,7 +35,7 @@ class DlgRef_3Spin1Check;
// class : BasicGUI_VectorDlg // class : BasicGUI_VectorDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_VectorDlg : public GEOMBase_Skeleton class BasicGUI_VectorDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

4
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
View File

@ -26,8 +26,6 @@
#ifndef BASICGUI_WORKINGPLANEDLG_H #ifndef BASICGUI_WORKINGPLANEDLG_H
#define BASICGUI_WORKINGPLANEDLG_H #define BASICGUI_WORKINGPLANEDLG_H
#include "GEOM_BasicGUI.hxx"
#include <GEOMBase_Skeleton.h> #include <GEOMBase_Skeleton.h>
#include <gp_Ax3.hxx> #include <gp_Ax3.hxx>
@ -41,7 +39,7 @@ class QCheckBox;
// class : BasicGUI_WorkingPlaneDlg // class : BasicGUI_WorkingPlaneDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class BASICGUI_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
{ {
Q_OBJECT Q_OBJECT

42
src/BasicGUI/GEOM_BasicGUI.hxx
View File

@ -1,42 +0,0 @@
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// File : GEOM_BasicGUI.hxx
// Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
//
#ifndef GEOM_BASICGUI_HXX
#define GEOM_BASICGUI_HXX
#if defined WIN32
# if defined BASICGUI_EXPORTS
# define BASICGUI_EXPORT __declspec( dllexport )
# else
# define BASICGUI_EXPORT __declspec( dllimport )
# endif
#else
# define BASICGUI_EXPORT
#endif
#ifndef COORD_MIN
#define COORD_MIN -1e+15
#define COORD_MAX +1e+15
#endif // COORD_MIN
#endif // GEOM_BASICGUI_HXX

113
src/BasicGUI/Makefile.am
View File

@ -1,5 +1,3 @@
# GEOM BASICGUI :
#
# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
@ -19,79 +17,90 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# File : Makefile.in # File : Makefile.am
# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) # Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
# Package : BasicGUI
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files # header files
salomeinclude_HEADERS = BasicGUI_PointDlg.h \ salomeinclude_HEADERS =
GEOM_BasicGUI.hxx
# Libraries targets # Libraries targets
lib_LTLIBRARIES = libBasicGUI.la lib_LTLIBRARIES = libBasicGUI.la
# Sources files # Sources files
dist_libBasicGUI_la_SOURCES = \ dist_libBasicGUI_la_SOURCES = \
BasicGUI.cxx \ BasicGUI.h \
BasicGUI_PointDlg.cxx \ BasicGUI_ArcDlg.h \
BasicGUI_LineDlg.cxx \ BasicGUI_CircleDlg.h \
BasicGUI_CircleDlg.cxx \ BasicGUI_CurveDlg.h \
BasicGUI_EllipseDlg.cxx \ BasicGUI_EllipseDlg.h \
BasicGUI_ArcDlg.cxx \ BasicGUI_LineDlg.h \
BasicGUI_VectorDlg.cxx \ BasicGUI_MarkerDlg.h \
BasicGUI_PlaneDlg.cxx \ BasicGUI_PlaneDlg.h \
BasicGUI_WorkingPlaneDlg.cxx \ BasicGUI_PointDlg.h \
BasicGUI_CurveDlg.cxx \ BasicGUI_VectorDlg.h \
BasicGUI_WorkingPlaneDlg.h \
\
BasicGUI.cxx \
BasicGUI_PointDlg.cxx \
BasicGUI_LineDlg.cxx \
BasicGUI_CircleDlg.cxx \
BasicGUI_EllipseDlg.cxx \
BasicGUI_ArcDlg.cxx \
BasicGUI_VectorDlg.cxx \
BasicGUI_PlaneDlg.cxx \
BasicGUI_WorkingPlaneDlg.cxx \
BasicGUI_CurveDlg.cxx \
BasicGUI_MarkerDlg.cxx BasicGUI_MarkerDlg.cxx
MOC_FILES = \ MOC_FILES = \
BasicGUI_PointDlg_moc.cxx \ BasicGUI_PointDlg_moc.cxx \
BasicGUI_LineDlg_moc.cxx \ BasicGUI_LineDlg_moc.cxx \
BasicGUI_CircleDlg_moc.cxx \ BasicGUI_CircleDlg_moc.cxx \
BasicGUI_EllipseDlg_moc.cxx \ BasicGUI_EllipseDlg_moc.cxx \
BasicGUI_ArcDlg_moc.cxx \ BasicGUI_ArcDlg_moc.cxx \
BasicGUI_VectorDlg_moc.cxx \ BasicGUI_VectorDlg_moc.cxx \
BasicGUI_PlaneDlg_moc.cxx \ BasicGUI_PlaneDlg_moc.cxx \
BasicGUI_WorkingPlaneDlg_moc.cxx \ BasicGUI_WorkingPlaneDlg_moc.cxx \
BasicGUI_CurveDlg_moc.cxx \ BasicGUI_CurveDlg_moc.cxx \
BasicGUI_MarkerDlg_moc.cxx BasicGUI_MarkerDlg_moc.cxx
nodist_libBasicGUI_la_SOURCES= \ nodist_libBasicGUI_la_SOURCES = \
$(MOC_FILES) $(MOC_FILES)
# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl # LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl
# LIB_SERVER_IDL = # LIB_SERVER_IDL =
# additionnal information to compil and link file # additionnal information to compil and link file
libBasicGUI_la_CPPFLAGS = \ libBasicGUI_la_CPPFLAGS = \
$(QT_INCLUDES) \ $(QT_INCLUDES) \
$(VTK_INCLUDES) \ $(VTK_INCLUDES) \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(PYTHON_INCLUDES) \ $(PYTHON_INCLUDES) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../DlgRef \ -I$(srcdir)/../DlgRef \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMFiltersSelection \
-I$(srcdir)/../GEOMBase \ -I$(srcdir)/../GEOMBase \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libBasicGUI_la_LDFLAGS = \ libBasicGUI_la_LDFLAGS = \
../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(GUI_LDFLAGS) -lsuit $(GUI_LDFLAGS) -lsuit

4
src/DisplayGUI/DisplayGUI.cxx
View File

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

29
src/DisplayGUI/DisplayGUI.h
View File

@ -28,30 +28,21 @@
#include "GEOMGUI.h" #include "GEOMGUI.h"
#if defined WIN32
# if defined DISPLAYGUI_EXPORTS
# define DISPLAYGUI_EXPORT __declspec( dllexport )
# else
# define DISPLAYGUI_EXPORT __declspec( dllimport )
# endif
#else
# define DISPLAYGUI_EXPORT
#endif
//================================================================================= //=================================================================================
// class : GEOMBase_Display // class : DisplayGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
//class QAD_ViewFrame;
class SUIT_ViewWindow; class SUIT_ViewWindow;
class DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI
class DisplayGUI : public GEOMGUI
{ {
public: public:
DisplayGUI( GeometryGUI* parent ); DisplayGUI( GeometryGUI* );
~DisplayGUI(); ~DisplayGUI();
// Dispatch menu command // Dispatch menu command
bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent); bool OnGUIEvent( int, SUIT_Desktop* );
// Display all GEOM objects // Display all GEOM objects
void DisplayAll(); void DisplayAll();
@ -66,16 +57,16 @@ public:
// DISPLAY MODE methods : 0 - wireframe, 1 - shading // DISPLAY MODE methods : 0 - wireframe, 1 - shading
// Set display mode for the viewer (current viewer if <viewWindow> - 0 ) // Set display mode for the viewer (current viewer if <viewWindow> - 0 )
void SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow = 0 ); void SetDisplayMode( const int, SUIT_ViewWindow* = 0 );
// Get display mode of the viewer (current viewer if <viewWindow> - 0 ) // Get display mode of the viewer (current viewer if <viewWindow> - 0 )
int GetDisplayMode( SUIT_ViewWindow* viewWindow = 0 ); int GetDisplayMode( SUIT_ViewWindow* = 0 );
// Invert display mode ( shadin <-> wireframe ) for the viewer // Invert display mode ( shadin <-> wireframe ) for the viewer
// (current viewer if <viewWindow> = 0 ) // (current viewer if <viewWindow> = 0 )
void InvertDisplayMode( SUIT_ViewWindow* viewWindow = 0 ); void InvertDisplayMode( SUIT_ViewWindow* = 0 );
// Set display mode for selected objects in the viewer given // Set display mode for selected objects in the viewer given
// (current viewer if <viewWindow> = 0 ) // (current viewer if <viewWindow> = 0 )
void ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindo = 0 ); void ChangeDisplayMode( const int, SUIT_ViewWindow* = 0 );
}; };
#endif // DISPLAYGUI_H #endif // DISPLAYGUI_H

85
src/DisplayGUI/Makefile.am
View File

@ -1,42 +1,40 @@
# GEOM DISPLAYGUI : # GEOM DISPLAYGUI :
# #
# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
# version 2.1 of the License. # version 2.1 of the License.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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
# #
# File : Makefile.am
# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
# Package : DisplayGUI
# #
#
# File : Makefile.in
# Author : Damien COQUERET (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : GEOM
# $Header:
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files # header files
salomeinclude_HEADERS = \ salomeinclude_HEADERS =
DisplayGUI.h
# Libraries targets # Libraries targets
lib_LTLIBRARIES = libDisplayGUI.la lib_LTLIBRARIES = libDisplayGUI.la
dist_libDisplayGUI_la_SOURCES = DisplayGUI.cxx dist_libDisplayGUI_la_SOURCES = \
DisplayGUI.h \
DisplayGUI.cxx
#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl #LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
@ -44,27 +42,26 @@ dist_libDisplayGUI_la_SOURCES = DisplayGUI.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
libDisplayGUI_la_CPPFLAGS = \ libDisplayGUI_la_CPPFLAGS = \
$(QT_INCLUDES) \ $(QT_INCLUDES) \
$(VTK_INCLUDES) \ $(VTK_INCLUDES) \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(PYTHON_INCLUDES) \ $(PYTHON_INCLUDES) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../GEOMBase \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMClient \ -I$(top_builddir)/idl \
-I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libDisplayGUI_la_LDFLAGS = \ libDisplayGUI_la_LDFLAGS = \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
../GEOMToolsGUI/libGEOMToolsGUI.la \ $(GUI_LDFLAGS) -lsuit -lSVTK \
$(GUI_LDFLAGS) -lsuit -lSVTK -lSOCC -lSalomePrs -lSalomeApp \ -lSOCC -lSalomePrs -lSalomeApp \
$(VTK_LIBS) \ $(VTK_LIBS) \
$(QT_MT_LIBS) $(QT_MT_LIBS)

4
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -759,7 +759,9 @@ void GEOMToolsGUI::deactivate()
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
GEOMTOOLSGUI_EXPORT #ifdef WIN32
__declspec( dllexport )
#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )
{ {
return new GEOMToolsGUI( parent ); return new GEOMToolsGUI( parent );

56
src/GEOMToolsGUI/GEOMToolsGUI.h
View File

@ -26,8 +26,6 @@
#ifndef GEOMTOOLSGUI_H #ifndef GEOMTOOLSGUI_H
#define GEOMTOOLSGUI_H #define GEOMTOOLSGUI_H
#include "GEOM_ToolsGUI.hxx"
#include <GEOMGUI.h> #include <GEOMGUI.h>
#include <SALOMEDSClient.hxx> #include <SALOMEDSClient.hxx>
@ -42,51 +40,51 @@ class SALOME_ListIO;
// class : GEOMToolsGUI // class : GEOMToolsGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOMTOOLSGUI_EXPORT GEOMToolsGUI : public GEOMGUI class GEOMToolsGUI : public GEOMGUI
{ {
public : public:
GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation
~GEOMToolsGUI(); ~GEOMToolsGUI();
bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent ); bool OnGUIEvent( int, SUIT_Desktop* );
virtual void deactivate(); virtual void deactivate();
private: private:
// Import and export topology methods // Import and export topology methods
bool Import(); bool Import();
bool Export(); bool Export();
void OnEditCopy(); void OnEditCopy();
void OnEditDelete(); void OnEditDelete();
void OnSettingsColor(); void OnSettingsColor();
void OnSettingsIsos(); void OnSettingsIsos();
void OnSettingsStep(); void OnSettingsStep();
void OnRename(); void OnRename();
void OnCheckGeometry(); void OnCheckGeometry();
// Popup commands // Popup commands
void OnColor(); void OnColor();
void OnTransparency(); void OnTransparency();
void OnNbIsos(); void OnNbIsos();
void OnOpen(); void OnOpen();
void OnSelectOnly(int mode); void OnSelectOnly( int );
// returns name of Module (Component) of given objects (usually selected objects) // returns name of Module (Component) of given objects (usually selected objects)
// if objects belong to different Components, a NULL string is returned. // if objects belong to different Components, a NULL string is returned.
QString getParentComponent( _PTR( Study ), const SALOME_ListIO& ); QString getParentComponent( _PTR(Study), const SALOME_ListIO& );
QString getParentComponent( _PTR(SObject) ); QString getParentComponent( _PTR(SObject) );
// Recursive deletion of object with children // Recursive deletion of object with children
void RemoveObjectWithChildren(_PTR(SObject) obj, void RemoveObjectWithChildren( _PTR(SObject),
_PTR(Study) aStudy, _PTR(Study),
QList<SALOME_View*> views, QList<SALOME_View*>,
GEOM_Displayer* disp); GEOM_Displayer* );
//checks if the object passed as the first argument depends on the second arguments //checks if the object passed as the first argument depends on the second arguments
bool CheckSubObjectInUse(_PTR(SObject) checkobj, bool CheckSubObjectInUse( _PTR(SObject),
_PTR(SObject) remobj, _PTR(SObject),
_PTR(Study) aStudy); _PTR(Study) );
}; };

32
src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h
View File

@ -26,8 +26,6 @@
#ifndef GEOMTOOLSGUI_NBISOSDLG_H #ifndef GEOMTOOLSGUI_NBISOSDLG_H
#define GEOMTOOLSGUI_NBISOSDLG_H #define GEOMTOOLSGUI_NBISOSDLG_H
#include "GEOM_ToolsGUI.hxx"
#include <QDialog> #include <QDialog>
class QSpinBox; class QSpinBox;
@ -36,30 +34,30 @@ class QSpinBox;
// class : GEOMToolsGUI_NbIsosDlg // class : GEOMToolsGUI_NbIsosDlg
// purpose : // purpose :
//================================================================================= //=================================================================================
class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_NbIsosDlg : public QDialog class GEOMToolsGUI_NbIsosDlg : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
GEOMToolsGUI_NbIsosDlg( QWidget* parent ); GEOMToolsGUI_NbIsosDlg( QWidget* );
~GEOMToolsGUI_NbIsosDlg(); ~GEOMToolsGUI_NbIsosDlg();
int getU() const; int getU() const;
int getV() const; int getV() const;
void setU( const int ); void setU( const int );
void setV( const int ); void setV( const int );
private slots: private slots:
void ClickOnHelp(); void ClickOnHelp();
private: private:
void keyPressEvent(QKeyEvent*); void keyPressEvent( QKeyEvent* );
private: private:
QSpinBox* SpinBoxU; QSpinBox* SpinBoxU;
QSpinBox* SpinBoxV; QSpinBox* SpinBoxV;
QString myHelpFileName; QString myHelpFileName;
}; };
#endif // GEOMTOOLSGUI_NBISOSDLG_H #endif // GEOMTOOLSGUI_NBISOSDLG_H

16
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
View File

@ -26,8 +26,6 @@
#ifndef GEOMTOOLSGUI_TRANSPARENCYDLG_H #ifndef GEOMTOOLSGUI_TRANSPARENCYDLG_H
#define GEOMTOOLSGUI_TRANSPARENCYDLG_H #define GEOMTOOLSGUI_TRANSPARENCYDLG_H
#include "GEOM_ToolsGUI.hxx"
#include <QDialog> #include <QDialog>
class QSlider; class QSlider;
@ -37,19 +35,19 @@ class QSlider;
// purpose : // purpose :
// : WARNING : that is a MODAL dialog. // : WARNING : that is a MODAL dialog.
//================================================================================= //=================================================================================
class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog class GEOMToolsGUI_TransparencyDlg : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
GEOMToolsGUI_TransparencyDlg( QWidget* parent ); GEOMToolsGUI_TransparencyDlg( QWidget* );
~GEOMToolsGUI_TransparencyDlg(); ~GEOMToolsGUI_TransparencyDlg();
private: private:
void keyPressEvent(QKeyEvent*); void keyPressEvent( QKeyEvent* );
private : private:
bool myFirstInit ; /* Inform for the first init */ bool myFirstInit; /* Inform for the first init */
QSlider* mySlider; QSlider* mySlider;
QString myHelpFileName; QString myHelpFileName;
@ -58,8 +56,6 @@ private slots:
void ClickOnClose(); void ClickOnClose();
void ClickOnHelp(); void ClickOnHelp();
void ValueHasChanged( int ) ; void ValueHasChanged( int ) ;
}; };
#endif // GEOMTOOLSGUI_TRANSPARENCYDLG_H #endif // GEOMTOOLSGUI_TRANSPARENCYDLG_H

37
src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
View File

@ -1,37 +0,0 @@
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// File : GEOM_ToolsGUI.hxx
// Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
//
#ifndef GEOM_TOOLSGUI_HXX
#define GEOM_TOOLSGUI_HXX
#if defined WIN32
# if defined GEOMTOOLSGUI_EXPORTS
# define GEOMTOOLSGUI_EXPORT __declspec( dllexport )
# else
# define GEOMTOOLSGUI_EXPORT __declspec( dllimport )
# endif
#else
# define GEOMTOOLSGUI_EXPORT
#endif
#endif // GEOM_TOOLSGUI_HXX

93
src/GEOMToolsGUI/Makefile.am
View File

@ -1,31 +1,26 @@
# GEOM GEOMTOOLSGUI : # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
# version 2.1 of the License. # version 2.1 of the License.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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
# #
# File : Makefile.am
# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
# Package : GEOMToolsGUI
# #
#
# File : Makefile.in
# Author : Damien COQUERET (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : GEOM
# $Header:
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
@ -35,17 +30,21 @@ lib_LTLIBRARIES = libGEOMToolsGUI.la
# header files # header files
salomeinclude_HEADERS = salomeinclude_HEADERS =
dist_libGEOMToolsGUI_la_SOURCES = \ dist_libGEOMToolsGUI_la_SOURCES = \
GEOMToolsGUI.cxx \ GEOMToolsGUI.h \
GEOMToolsGUI_1.cxx \ GEOMToolsGUI_NbIsosDlg.h \
GEOMToolsGUI_TransparencyDlg.cxx \ GEOMToolsGUI_TransparencyDlg.h \
\
GEOMToolsGUI.cxx \
GEOMToolsGUI_1.cxx \
GEOMToolsGUI_TransparencyDlg.cxx \
GEOMToolsGUI_NbIsosDlg.cxx GEOMToolsGUI_NbIsosDlg.cxx
MOC_FILES = \ MOC_FILES = \
GEOMToolsGUI_TransparencyDlg_moc.cxx \ GEOMToolsGUI_TransparencyDlg_moc.cxx \
GEOMToolsGUI_NbIsosDlg_moc.cxx GEOMToolsGUI_NbIsosDlg_moc.cxx
nodist_libGEOMToolsGUI_la_SOURCES= \ nodist_libGEOMToolsGUI_la_SOURCES = \
$(MOC_FILES) $(MOC_FILES)
#LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \ #LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \
@ -56,25 +55,25 @@ nodist_libGEOMToolsGUI_la_SOURCES= \
#LIB_SERVER_IDL = #LIB_SERVER_IDL =
# additionnal information to compile and link file # additionnal information to compile and link file
libGEOMToolsGUI_la_CPPFLAGS = \ libGEOMToolsGUI_la_CPPFLAGS = \
$(QT_INCLUDES) \ $(QT_INCLUDES) \
$(VTK_INCLUDES) \ $(VTK_INCLUDES) \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(PYTHON_INCLUDES) \ $(PYTHON_INCLUDES) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../GEOMBase \ -I$(srcdir)/../GEOMBase \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libGEOMToolsGUI_la_LDFLAGS = \ libGEOMToolsGUI_la_LDFLAGS = \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp