From: sbh Date: Fri, 31 Aug 2012 11:59:33 +0000 (+0000) Subject: Merge branches BR_HDF_dev and branch for porting SUIT to the qt 4.7.2 X-Git-Tag: V5_2_5~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=edfdd192f887a12c5e62d7d38ab7a4dbeaf86e07;p=modules%2Fgui.git Merge branches BR_HDF_dev and branch for porting SUIT to the qt 4.7.2 --- diff --git a/.cproject b/.cproject new file mode 100644 index 000000000..b60927323 --- /dev/null +++ b/.cproject @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + install + true + true + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 000000000..86cb84168 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,3 @@ +Makefile +.project +.cproject diff --git a/.project b/.project new file mode 100644 index 000000000..3f7671410 --- /dev/null +++ b/.project @@ -0,0 +1,83 @@ + + + GUI_SRC + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + all + + + org.eclipse.cdt.make.core.buildArguments + suit-build.py + + + org.eclipse.cdt.make.core.buildCommand + python + + + org.eclipse.cdt.make.core.buildLocation + ${workspace_loc}/bop.build/suit-build/v5.1.21.local + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/src/CAF/CAF.pro b/src/CAF/CAF.pro index 50e2c29af..20dd9dd59 100644 --- a/src/CAF/CAF.pro +++ b/src/CAF/CAF.pro @@ -13,7 +13,7 @@ INCLUDEPATH += $${CAS_CPPFLAGS} LIBS += $${CAS_KERNEL} $${CAS_VIEWER} -lQtx -lSUIT -lSTD win32:DEFINES += WIN32 -DEFINES += $(CASDEFINES) CAF_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS +DEFINES += $(CASDEFINES) CAF_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=3 OCC_VERSION_MAINTENANCE=5 LIN LINTEL CSFDB No_Exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS include(../Translations.pro) include(../Resources.pro) diff --git a/src/CAM/.cvsignore b/src/CAM/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/CAM/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/Common.pro b/src/Common.pro index 0b65f10f4..29e2104e3 100644 --- a/src/Common.pro +++ b/src/Common.pro @@ -13,23 +13,24 @@ win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe isEmpty( HEADERS ):HEADERS = *.h isEmpty( SOURCES ):SOURCES = *.cxx -MOC_DIR = ../../moc +MOC_DIR = ../../../tmp/$$(CONFIG_ID)/moc unix { - OBJECTS_DIR = ../../$$(CONFIG_ID)/obj + OBJECTS_DIR = ../../../tmp/$$(CONFIG_ID)/obj contains( TEMPLATE, lib ) { - DESTDIR = ../../$(CONFIG_ID)/lib + DESTDIR = ../../../SUIT/$(CONFIG_ID)/lib } else { - DESTDIR = ../../$(CONFIG_ID)/bin + DESTDIR = ../../../SUIT/$(CONFIG_ID)/bin } - INCLUDEPATH += ../../$(CONFIG_ID)/include - LIBS += -L../../$(CONFIG_ID)/lib + HEADERS_DIR = ../../../SUIT/$(CONFIG_ID)/include + INCLUDEPATH += $${HEADERS_DIR} + LIBS += -L../../../SUIT/$(CONFIG_ID)/lib - GUIResources = ../../$(CONFIG_ID)/resources + GUIResources = ../../../SUIT/$(CONFIG_ID)/resources includes.files = $$HEADERS - includes.path = ../../$(CONFIG_ID)/include + includes.path = $${HEADERS_DIR} INSTALLS += includes } diff --git a/src/Event/.cvsignore b/src/Event/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/Event/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/HTMLService/.cvsignore b/src/HTMLService/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/HTMLService/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro index 694433f9a..69bf3b730 100755 --- a/src/HTMLService/HTMLService.pro +++ b/src/HTMLService/HTMLService.pro @@ -16,4 +16,4 @@ win32:LIBS *= -L$(QTLIB) win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml win32:DEFINES += WNT WIN32 -DEFINES += HTMLSERVICE_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS +DEFINES += HTMLSERVICE_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=3 OCC_VERSION_MAINTENANCE=5 LIN LINTEL CSFDB No_Exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS diff --git a/src/LogWindow/.cvsignore b/src/LogWindow/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/LogWindow/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/OBJECT/.cvsignore b/src/OBJECT/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/OBJECT/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/OBJECT/Handle_SALOME_AISObject.hxx b/src/OBJECT/Handle_SALOME_AISObject.hxx index 342cf6221..48cc0783b 100755 --- a/src/OBJECT/Handle_SALOME_AISObject.hxx +++ b/src/OBJECT/Handle_SALOME_AISObject.hxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : Handle_SALOME_AISObject.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_AISObject_HeaderFile #define _Handle_SALOME_AISObject_HeaderFile diff --git a/src/OBJECT/Handle_SALOME_AISShape.hxx b/src/OBJECT/Handle_SALOME_AISShape.hxx index b987b929a..9691f06b3 100755 --- a/src/OBJECT/Handle_SALOME_AISShape.hxx +++ b/src/OBJECT/Handle_SALOME_AISShape.hxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : Handle_SALOME_AISShape.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_AISShape_HeaderFile #define _Handle_SALOME_AISShape_HeaderFile @@ -34,8 +34,11 @@ #include #endif -#ifndef _Handle_AIS_Shape_HeaderFile -#include +// #ifndef _Handle_AIS_Shape_HeaderFile +// #include +// #endif +#ifndef _AIS_TexturedShape_HeaderFile +#include #endif class Standard_Transient; @@ -44,7 +47,8 @@ class Handle_Standard_Type; \class Handle(AIS_Shape) Smart pointer (handle) to AIS_Shape */ -class Handle(AIS_Shape); +// class Handle(AIS_Shape); +class Handle(AIS_TexturedShape); class SALOME_AISShape; Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SALOME_AISShape); @@ -52,7 +56,7 @@ Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SALOME_AISShape); \class Handle(SALOME_AISShape) Smart pointer (handle) to SALOME_AISShape */ -class Handle(SALOME_AISShape) : public Handle(AIS_Shape) { +class Handle(SALOME_AISShape) : public Handle(AIS_TexturedShape) { public: inline void* operator new(size_t,void* anAddress) { @@ -70,12 +74,12 @@ class Handle(SALOME_AISShape) : public Handle(AIS_Shape) { // { // if (anAddress) Standard::Free((Standard_Address&)anAddress,size); // } - Handle(SALOME_AISShape)():Handle(AIS_Shape)() {} - Handle(SALOME_AISShape)(const Handle(SALOME_AISShape)& aHandle) : Handle(AIS_Shape)(aHandle) + Handle(SALOME_AISShape)():Handle(AIS_TexturedShape)() {} + Handle(SALOME_AISShape)(const Handle(SALOME_AISShape)& aHandle) : Handle(AIS_TexturedShape)(aHandle) { } - Handle(SALOME_AISShape)(const SALOME_AISShape* anItem) : Handle(AIS_Shape)((AIS_Shape *)anItem) + Handle(SALOME_AISShape)(const SALOME_AISShape* anItem) : Handle(AIS_TexturedShape)((AIS_TexturedShape *)anItem) { } diff --git a/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx b/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx index b94e60d00..128d7e1f0 100644 --- a/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx +++ b/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile #define _Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile diff --git a/src/OBJECT/Handle_SALOME_Filter.hxx b/src/OBJECT/Handle_SALOME_Filter.hxx index 8c2294006..8b77aa99d 100644 --- a/src/OBJECT/Handle_SALOME_Filter.hxx +++ b/src/OBJECT/Handle_SALOME_Filter.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : Handle_SALOME_Filter.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_Filter_HeaderFile #define _Handle_SALOME_Filter_HeaderFile diff --git a/src/OBJECT/Handle_SALOME_InteractiveObject.hxx b/src/OBJECT/Handle_SALOME_InteractiveObject.hxx index 9bc3776c9..6fcc95bb5 100755 --- a/src/OBJECT/Handle_SALOME_InteractiveObject.hxx +++ b/src/OBJECT/Handle_SALOME_InteractiveObject.hxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : Handle_SALOME_InteractiveObject.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_InteractiveObject_HeaderFile #define _Handle_SALOME_InteractiveObject_HeaderFile diff --git a/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx b/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx index e78995482..e4fde95f1 100644 --- a/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx +++ b/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : Handle_SALOME_ListNodeOfListIO.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_ListNodeOfListIO_HeaderFile #define _Handle_SALOME_ListNodeOfListIO_HeaderFile diff --git a/src/OBJECT/Handle_SALOME_TypeFilter.hxx b/src/OBJECT/Handle_SALOME_TypeFilter.hxx index 4ca800e04..d8e2b7d93 100644 --- a/src/OBJECT/Handle_SALOME_TypeFilter.hxx +++ b/src/OBJECT/Handle_SALOME_TypeFilter.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : Handle_SALOME_TypeFilter.hxx // Module : SALOME - +// #ifndef _Handle_SALOME_TypeFilter_HeaderFile #define _Handle_SALOME_TypeFilter_HeaderFile @@ -35,7 +35,7 @@ #endif #ifndef _Handle_SALOME_Filter_HeaderFile -#include +#include "Handle_SALOME_Filter.hxx" #endif class Standard_Transient; diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro index a5b7952b6..33796e254 100644 --- a/src/OBJECT/OBJECT.pro +++ b/src/OBJECT/OBJECT.pro @@ -16,5 +16,5 @@ win32:LIBS *= -L$(QTLIB) win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml win32:DEFINES += WNT WIN32 -DEFINES += $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS +DEFINES += $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=3 OCC_VERSION_MAINTENANCE=5 OCC_VERSION_LARGE=0x06050300 LIN LINTEL CSFDB No_Exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx index c50184989..319ee4553 100755 --- a/src/OBJECT/SALOME_AISObject.cxx +++ b/src/OBJECT/SALOME_AISObject.cxx @@ -1,30 +1,27 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISObject.hxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -//using namespace std; #include "SALOME_AISObject.ixx" diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx index b89716f4c..0e52e30da 100755 --- a/src/OBJECT/SALOME_AISObject.hxx +++ b/src/OBJECT/SALOME_AISObject.hxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISObject.hxx // Module : SALOME - +// #ifndef _SALOME_AISObject_HeaderFile #define _SALOME_AISObject_HeaderFile @@ -31,7 +31,7 @@ #include #endif #ifndef _Handle_SALOME_AISObject_HeaderFile -#include +#include "Handle_SALOME_AISObject.hxx" #endif #ifndef _AIS_InteractiveObject_HeaderFile @@ -84,7 +84,7 @@ Standard_EXPORT ~SALOME_AISObject(); // Standard_EXPORT friend Handle_Standard_Type& SALOME_AISObject_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OBJECT/SALOME_AISObject.ixx b/src/OBJECT/SALOME_AISObject.ixx index 11980b967..be6891be7 100755 --- a/src/OBJECT/SALOME_AISObject.ixx +++ b/src/OBJECT/SALOME_AISObject.ixx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISObject.ixx // Module : SALOME - +// #include "SALOME_AISObject.jxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -51,10 +51,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_AISObject_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,aType5,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_AISObject", - sizeof(SALOME_AISObject), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_AISObject), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_AISObject.jxx b/src/OBJECT/SALOME_AISObject.jxx index 95635ee72..0b3498fd9 100755 --- a/src/OBJECT/SALOME_AISObject.jxx +++ b/src/OBJECT/SALOME_AISObject.jxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISObject.jxx // Module : SALOME - +// #ifndef _SALOME_InteractiveObject_HeaderFile #include "SALOME_InteractiveObject.hxx" #endif diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx index 52afc406d..b88ad0c55 100755 --- a/src/OBJECT/SALOME_AISShape.cxx +++ b/src/OBJECT/SALOME_AISShape.cxx @@ -1,32 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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. // -// File : SALOME_AISShape.hxx +// 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 +// + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// File : SALOME_AISShape.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -//using namespace std; #include "SALOME_AISShape.ixx" /*! @@ -34,7 +31,7 @@ \param shape - TopoDS shape */ SALOME_AISShape::SALOME_AISShape(const TopoDS_Shape& shape) -: AIS_Shape(shape) +: AIS_TexturedShape(shape) { } diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx index 4a8b87d98..0064e61de 100755 --- a/src/OBJECT/SALOME_AISShape.hxx +++ b/src/OBJECT/SALOME_AISShape.hxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISShape.hxx // Module : SALOME - +// #ifndef _SALOME_AISShape_HeaderFile #define _SALOME_AISShape_HeaderFile @@ -31,7 +31,7 @@ #include #endif #ifndef _Handle_SALOME_AISShape_HeaderFile -#include +#include "Handle_SALOME_AISShape.hxx" #endif #ifndef _Standard_CString_HeaderFile @@ -40,18 +40,22 @@ #ifndef _Handle_SALOME_InteractiveObject_HeaderFile #include #endif -#ifndef _AIS_Shape_HeaderFile -#include +// #ifndef _AIS_Shape_HeaderFile +// #include +// #endif +#ifndef _AIS_TexturedShape_HeaderFile +#include #endif #ifndef _Standard_Boolean_HeaderFile #include #endif + class SALOME_InteractiveObject; class TopoDS_Shape; class TColStd_IndexedMapOfInteger; -class SALOME_AISShape : public AIS_Shape { +class SALOME_AISShape : public AIS_TexturedShape { public: @@ -76,6 +80,8 @@ public: Standard_EXPORT SALOME_AISShape(const TopoDS_Shape& shape); Standard_EXPORT virtual Handle_SALOME_InteractiveObject getIO() = 0; Standard_EXPORT virtual Standard_Boolean hasIO() = 0; +Standard_EXPORT virtual Standard_Boolean isTopLevel() = 0; +Standard_EXPORT virtual void setTopLevel(Standard_Boolean) = 0; Standard_EXPORT virtual Standard_CString getName() = 0; Standard_EXPORT virtual void setName(const Standard_CString aName) = 0; Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ) = 0; @@ -88,7 +94,7 @@ Standard_EXPORT ~SALOME_AISShape(); // Standard_EXPORT friend Handle_Standard_Type& SALOME_AISShape_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: @@ -107,7 +113,7 @@ private: // Fields PRIVATE // - + }; diff --git a/src/OBJECT/SALOME_AISShape.ixx b/src/OBJECT/SALOME_AISShape.ixx index 11909336e..5ace4ce0e 100755 --- a/src/OBJECT/SALOME_AISShape.ixx +++ b/src/OBJECT/SALOME_AISShape.ixx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISShape.ixx // Module : SALOME - +// #include "SALOME_AISShape.jxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -37,8 +37,8 @@ SALOME_AISShape::~SALOME_AISShape() {} Standard_EXPORT Handle_Standard_Type& SALOME_AISShape_Type_() { - static Handle_Standard_Type aType1 = STANDARD_TYPE(AIS_Shape); - if ( aType1.IsNull()) aType1 = STANDARD_TYPE(AIS_Shape); + static Handle_Standard_Type aType1 = STANDARD_TYPE(AIS_TexturedShape); + if ( aType1.IsNull()) aType1 = STANDARD_TYPE(AIS_TexturedShape); static Handle_Standard_Type aType2 = STANDARD_TYPE(AIS_InteractiveObject); if ( aType2.IsNull()) aType2 = STANDARD_TYPE(AIS_InteractiveObject); static Handle_Standard_Type aType3 = STANDARD_TYPE(SelectMgr_SelectableObject); @@ -53,10 +53,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_AISShape_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,aType5,aType6,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_AISShape", - sizeof(SALOME_AISShape), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_AISShape), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_AISShape.jxx b/src/OBJECT/SALOME_AISShape.jxx index cae6c5f54..b60ddafda 100755 --- a/src/OBJECT/SALOME_AISShape.jxx +++ b/src/OBJECT/SALOME_AISShape.jxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_AISShape.jxx // Module : SALOME - +// #ifndef _SALOME_InteractiveObject_HeaderFile #include "SALOME_InteractiveObject.hxx" #endif diff --git a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx index 34ebe62d6..5547659f2 100644 --- a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx +++ b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx // Module : SALOME - +// #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile #define _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile @@ -31,10 +31,10 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile -#include +#include "Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #endif class Standard_NoSuchObject; class SALOME_InteractiveObject; diff --git a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx index f24caa367..4b65fe156 100644 --- a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx +++ b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx // Module : SALOME - +// #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #ifndef _Standard_NoSuchObject_HeaderFile @@ -44,8 +44,6 @@ #ifndef _SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #endif -using namespace std; - #define TheKey Handle_SALOME_InteractiveObject #define TheKey_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx index 3c100b02e..2cf7ba305 100644 --- a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx +++ b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx // Module : SALOME - +// #ifndef _SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile #define _SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile @@ -31,11 +31,11 @@ #include #endif #ifndef _Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile -#include +#include "Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _TColStd_IndexedMapOfInteger_HeaderFile #include @@ -87,7 +87,7 @@ Standard_EXPORT ~SALOME_DataMapNodeOfDataMapOfIOMapOfInteger(); // Standard_EXPORT friend Handle_Standard_Type& SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx index b1a4c95fa..41cf76a2a 100644 --- a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx +++ b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx // Module : SALOME - +// #include "SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -45,7 +45,6 @@ #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #endif -using namespace std; /*! Destructor @@ -70,10 +69,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_DataMapNodeOfDataMapOfIOMapOfIntege static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_DataMapNodeOfDataMapOfIOMapOfInteger", - sizeof(SALOME_DataMapNodeOfDataMapOfIOMapOfInteger), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_DataMapNodeOfDataMapOfIOMapOfInteger), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx index f3aa034f7..d3fff5148 100644 --- a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx +++ b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx @@ -1,26 +1,26 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapOfIOMapOfInteger.hxx // Module : SALOME @@ -31,10 +31,10 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_HeaderFile -#include +#include "Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx" #endif #ifndef _Standard_Integer_HeaderFile #include @@ -42,6 +42,7 @@ #ifndef _Standard_Boolean_HeaderFile #include #endif + class Standard_DomainError; class Standard_NoSuchObject; class SALOME_InteractiveObject; @@ -50,7 +51,6 @@ class TColStd_MapTransientHasher; class SALOME_DataMapNodeOfDataMapOfIOMapOfInteger; class SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger; - #ifndef _Standard_HeaderFile #include #endif @@ -74,10 +74,7 @@ public: { if (anAddress) Standard::Free((Standard_Address&)anAddress); } -// inline void operator delete(void *anAddress, size_t size) -// { -// if (anAddress) Standard::Free((Standard_Address&)anAddress,size); -// } + // Methods PUBLIC // Standard_EXPORT SALOME_DataMapOfIOMapOfInteger(const Standard_Integer NbBuckets = 1); @@ -109,40 +106,16 @@ Standard_EXPORT TColStd_IndexedMapOfInteger& ChangeFind(const Handle(SALOME_In return ChangeFind(K); } - - - - - -protected: - - // Methods PROTECTED - // - - - // Fields PROTECTED - // - +#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version +Standard_EXPORT Standard_Address Find1 (const Handle(SALOME_InteractiveObject)& K) const; +Standard_EXPORT Standard_Address ChangeFind1 (const Handle(SALOME_InteractiveObject)& K); +#endif private: - - // Methods PRIVATE - // Standard_EXPORT SALOME_DataMapOfIOMapOfInteger(const SALOME_DataMapOfIOMapOfInteger& Other); - - - // Fields PRIVATE - // - - }; - - - - // other inline functions and methods (like "C++: function call" methods) // - #endif diff --git a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx index bf8f76794..ba080cf65 100644 --- a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx +++ b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapOfIOMapOfInteger_0.cxx // Module : SALOME - +// #include "SALOME_DataMapOfIOMapOfInteger.hxx" #ifndef _Standard_DomainError_HeaderFile @@ -47,8 +47,6 @@ #ifndef _SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_HeaderFile #include "SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx" #endif -using namespace std; - #define TheKey Handle_SALOME_InteractiveObject #define TheKey_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_Filter.cxx b/src/OBJECT/SALOME_Filter.cxx index 79ba21691..c2ff11a6b 100644 --- a/src/OBJECT/SALOME_Filter.cxx +++ b/src/OBJECT/SALOME_Filter.cxx @@ -1,31 +1,28 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Filter.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ #include "SALOME_Filter.ixx" -using namespace std; diff --git a/src/OBJECT/SALOME_Filter.hxx b/src/OBJECT/SALOME_Filter.hxx index 4386503a5..06be9dc5f 100644 --- a/src/OBJECT/SALOME_Filter.hxx +++ b/src/OBJECT/SALOME_Filter.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Filter.hxx // Module : SALOME - +// #ifndef _SALOME_Filter_HeaderFile #define _SALOME_Filter_HeaderFile @@ -31,7 +31,7 @@ #include #endif #ifndef _Handle_SALOME_Filter_HeaderFile -#include +#include "Handle_SALOME_Filter.hxx" #endif #ifndef _MMgt_TShared_HeaderFile @@ -41,7 +41,7 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif class SALOME_Filter : public MMgt_TShared { @@ -76,7 +76,7 @@ Standard_EXPORT ~SALOME_Filter(); // Standard_EXPORT friend Handle_Standard_Type& SALOME_Filter_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OBJECT/SALOME_Filter.ixx b/src/OBJECT/SALOME_Filter.ixx index c872cef3f..faea1aa62 100644 --- a/src/OBJECT/SALOME_Filter.ixx +++ b/src/OBJECT/SALOME_Filter.ixx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Filter.ixx // Module : SALOME - +// #include "SALOME_Filter.jxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -45,10 +45,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_Filter_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_Filter", - sizeof(SALOME_Filter), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_Filter), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_Filter.jxx b/src/OBJECT/SALOME_Filter.jxx index db8562e5a..ce3db4b9f 100644 --- a/src/OBJECT/SALOME_Filter.jxx +++ b/src/OBJECT/SALOME_Filter.jxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_Filter.jxx // Module : SALOME - +// #ifndef _SALOME_Filter_HeaderFile #include "SALOME_Filter.hxx" #endif diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx index 53d93c062..494aac775 100755 --- a/src/OBJECT/SALOME_InteractiveObject.cxx +++ b/src/OBJECT/SALOME_InteractiveObject.cxx @@ -1,32 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_InteractiveObject.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ -//using namespace std; /*! \class SALOME_InteractiveObject SALOME_InteractiveObject.hxx \brief ... @@ -52,8 +49,8 @@ SALOME_InteractiveObject::SALOME_InteractiveObject() \param aName - name of object */ SALOME_InteractiveObject::SALOME_InteractiveObject(const char* anEntry, - const char* aComponentDataType, - const char* aName): + const char* aComponentDataType, + const char* aName): myEntry(anEntry), myName(aName), myComponentDataType(aComponentDataType), diff --git a/src/OBJECT/SALOME_InteractiveObject.hxx b/src/OBJECT/SALOME_InteractiveObject.hxx index 712d96d3b..8f8abdbe6 100755 --- a/src/OBJECT/SALOME_InteractiveObject.hxx +++ b/src/OBJECT/SALOME_InteractiveObject.hxx @@ -1,37 +1,48 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_InteractiveObject.hxx // Module : SALOME - +// #ifndef _SALOME_InteractiveObject_HeaderFile #define _SALOME_InteractiveObject_HeaderFile #ifndef _Standard_HeaderFile +// E.A. : Standard.hxx defines PACKAGE and VERSION --> Pb in Werror mode +// E.A. : --> Add the undef of PACKAGE and VERSION (really ugly !) +#ifdef PACKAGE +#undef PACKAGE +#endif +#ifdef VERSION +#undef VERSION +#endif +#ifdef HAVE_FINITE +#undef HAVE_FINITE +#endif #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _Standard_CString_HeaderFile @@ -66,8 +77,8 @@ public: // Standard_EXPORT SALOME_InteractiveObject(); Standard_EXPORT SALOME_InteractiveObject(const char* anEntry, - const char* aComponentDataType, - const char* aName = ""); + const char* aComponentDataType, + const char* aName = ""); Standard_EXPORT void setEntry(const char* anEntry) ; Standard_EXPORT const char* getEntry() ; Standard_EXPORT void setName(const char* aName) ; @@ -98,7 +109,7 @@ friend Standard_Boolean IsEqual(const Handle(SALOME_InteractiveObject)& anIO1, // Standard_EXPORT friend Handle_Standard_Type& SALOME_InteractiveObject_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OBJECT/SALOME_InteractiveObject.ixx b/src/OBJECT/SALOME_InteractiveObject.ixx index ef92c07c6..897576315 100755 --- a/src/OBJECT/SALOME_InteractiveObject.ixx +++ b/src/OBJECT/SALOME_InteractiveObject.ixx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_InteractiveObject.ixx // Module : SALOME - +// #include "SALOME_InteractiveObject.jxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -45,10 +45,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_InteractiveObject_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_InteractiveObject", - sizeof(SALOME_InteractiveObject), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_InteractiveObject), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_InteractiveObject.jxx b/src/OBJECT/SALOME_InteractiveObject.jxx index 0c3fc7db5..178bdde5a 100755 --- a/src/OBJECT/SALOME_InteractiveObject.jxx +++ b/src/OBJECT/SALOME_InteractiveObject.jxx @@ -1,29 +1,29 @@ -// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers // File : SALOME_InteractiveObject.jxx // Module : SALOME - +// #ifndef _SALOME_InteractiveObject_HeaderFile #include "SALOME_InteractiveObject.hxx" #endif diff --git a/src/OBJECT/SALOME_ListIO.hxx b/src/OBJECT/SALOME_ListIO.hxx index 7f52828d4..84137703a 100644 --- a/src/OBJECT/SALOME_ListIO.hxx +++ b/src/OBJECT/SALOME_ListIO.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListIO.hxx // Module : SALOME - +// #ifndef _SALOME_ListIO_HeaderFile #define _SALOME_ListIO_HeaderFile @@ -31,10 +31,10 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _Handle_SALOME_ListNodeOfListIO_HeaderFile -#include +#include "Handle_SALOME_ListNodeOfListIO.hxx" #endif #ifndef _Standard_Integer_HeaderFile #include diff --git a/src/OBJECT/SALOME_ListIO_0.cxx b/src/OBJECT/SALOME_ListIO_0.cxx index 7538c4744..155c22289 100644 --- a/src/OBJECT/SALOME_ListIO_0.cxx +++ b/src/OBJECT/SALOME_ListIO_0.cxx @@ -1,28 +1,27 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListIO_0.cxx -// Module : SALOME #include "SALOME_ListIO.hxx" @@ -38,8 +37,6 @@ #ifndef _SALOME_ListNodeOfListIO_HeaderFile #include "SALOME_ListNodeOfListIO.hxx" #endif -using namespace std; - #define Item Handle_SALOME_InteractiveObject #define Item_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_ListIteratorOfListIO.hxx b/src/OBJECT/SALOME_ListIteratorOfListIO.hxx index e69f42d5c..92303cbec 100644 --- a/src/OBJECT/SALOME_ListIteratorOfListIO.hxx +++ b/src/OBJECT/SALOME_ListIteratorOfListIO.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListIteratorOfListIO.hxx // Module : SALOME - +// #ifndef _SALOME_ListIteratorOfListIO_HeaderFile #define _SALOME_ListIteratorOfListIO_HeaderFile @@ -31,10 +31,10 @@ #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _Handle_SALOME_ListNodeOfListIO_HeaderFile -#include +#include "Handle_SALOME_ListNodeOfListIO.hxx" #endif #ifndef _Standard_Boolean_HeaderFile #include diff --git a/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx b/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx index 6f5fb7f85..2297f4813 100644 --- a/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx +++ b/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx @@ -1,28 +1,27 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListIteratorOfListIO_0.cxx -// Module : SALOME #include "SALOME_ListIteratorOfListIO.hxx" @@ -41,8 +40,7 @@ #ifndef _SALOME_ListNodeOfListIO_HeaderFile #include "SALOME_ListNodeOfListIO.hxx" #endif -using namespace std; - + #define Item Handle_SALOME_InteractiveObject #define Item_hxx "SALOME_InteractiveObject.hxx" diff --git a/src/OBJECT/SALOME_ListNodeOfListIO.hxx b/src/OBJECT/SALOME_ListNodeOfListIO.hxx index 6d288bcab..51bd58ebf 100644 --- a/src/OBJECT/SALOME_ListNodeOfListIO.hxx +++ b/src/OBJECT/SALOME_ListNodeOfListIO.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListNodeOfListIO.hxx // Module : SALOME - +// #ifndef _SALOME_ListNodeOfListIO_HeaderFile #define _SALOME_ListNodeOfListIO_HeaderFile @@ -31,11 +31,11 @@ #include #endif #ifndef _Handle_SALOME_ListNodeOfListIO_HeaderFile -#include +#include "Handle_SALOME_ListNodeOfListIO.hxx" #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile -#include +#include "Handle_SALOME_InteractiveObject.hxx" #endif #ifndef _TCollection_MapNode_HeaderFile #include @@ -80,7 +80,7 @@ Standard_EXPORT ~SALOME_ListNodeOfListIO(); // Standard_EXPORT friend Handle_Standard_Type& SALOME_ListNodeOfListIO_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx b/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx index 63fda117c..ed7dcd924 100644 --- a/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx +++ b/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx @@ -1,28 +1,27 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_ListNodeOfListIO_0.cxx -// Module : SALOME #include "SALOME_ListNodeOfListIO.hxx" @@ -39,7 +38,6 @@ #ifndef _SALOME_ListIteratorOfListIO_HeaderFile #include "SALOME_ListIteratorOfListIO.hxx" #endif -using namespace std; /*! Destructor @@ -63,10 +61,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_ListNodeOfListIO_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_ListNodeOfListIO", - sizeof(SALOME_ListNodeOfListIO), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_ListNodeOfListIO), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_Selection.h b/src/OBJECT/SALOME_Selection.h index 696f68f55..43af8ad87 100644 --- a/src/OBJECT/SALOME_Selection.h +++ b/src/OBJECT/SALOME_Selection.h @@ -1,30 +1,28 @@ -// SALOME Selection : description of enumeration Selection_Mode +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME Selection : description of enumeration Selection_Mode // File : SALOME_Selection.h // Author : -// Module : SALOME -// $Header$ #ifndef SALOME_SELECTION_H #define SALOME_SELECTION_H diff --git a/src/OBJECT/SALOME_TypeFilter.cxx b/src/OBJECT/SALOME_TypeFilter.cxx index 57d6390a2..d7a623b25 100644 --- a/src/OBJECT/SALOME_TypeFilter.cxx +++ b/src/OBJECT/SALOME_TypeFilter.cxx @@ -1,34 +1,31 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_TypeFilter.cxx // Author : Nicolas REJNERI -// Module : SALOME -// $Header$ #include "SALOME_TypeFilter.ixx" #include "SALOME_InteractiveObject.hxx" -using namespace std; /*! Constructor diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx index 5a32301fe..9e6c03215 100644 --- a/src/OBJECT/SALOME_TypeFilter.hxx +++ b/src/OBJECT/SALOME_TypeFilter.hxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_TypeFilter.hxx // Module : SALOME - +// #ifndef _SALOME_TypeFilter_HeaderFile #define _SALOME_TypeFilter_HeaderFile @@ -31,7 +31,7 @@ #include #endif #ifndef _Handle_SALOME_TypeFilter_HeaderFile -#include +#include "Handle_SALOME_TypeFilter.hxx" #endif #ifndef _Standard_CString_HeaderFile @@ -80,7 +80,7 @@ Standard_EXPORT ~SALOME_TypeFilter(); // Standard_EXPORT friend Handle_Standard_Type& SALOME_TypeFilter_Type_(); Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; - Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const; protected: diff --git a/src/OBJECT/SALOME_TypeFilter.ixx b/src/OBJECT/SALOME_TypeFilter.ixx index 13e1a3ec1..5b2d736d7 100644 --- a/src/OBJECT/SALOME_TypeFilter.ixx +++ b/src/OBJECT/SALOME_TypeFilter.ixx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_TypeFilter.ixx // Module : SALOME - +// #include "SALOME_TypeFilter.jxx" #ifndef _Standard_TypeMismatch_HeaderFile @@ -47,10 +47,10 @@ Standard_EXPORT Handle_Standard_Type& SALOME_TypeFilter_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; static Handle_Standard_Type _aType = new Standard_Type("SALOME_TypeFilter", - sizeof(SALOME_TypeFilter), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(SALOME_TypeFilter), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } diff --git a/src/OBJECT/SALOME_TypeFilter.jxx b/src/OBJECT/SALOME_TypeFilter.jxx index d519586d7..249780fc8 100644 --- a/src/OBJECT/SALOME_TypeFilter.jxx +++ b/src/OBJECT/SALOME_TypeFilter.jxx @@ -1,29 +1,29 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_TypeFilter.jxx // Module : SALOME - +// #ifndef _SALOME_TypeFilter_HeaderFile #include "SALOME_TypeFilter.hxx" #endif diff --git a/src/ObjBrowser/.cvsignore b/src/ObjBrowser/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/ObjBrowser/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/Plot2d/.cvsignore b/src/Plot2d/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/Plot2d/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h index 965f67eb2..6317133bf 100755 --- a/src/Plot2d/Plot2d.h +++ b/src/Plot2d/Plot2d.h @@ -35,6 +35,7 @@ #include #include +#include class QPainter; diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx index 43e91a991..174e421cf 100755 --- a/src/Plot2d/Plot2d_Curve.cxx +++ b/src/Plot2d/Plot2d_Curve.cxx @@ -118,10 +118,11 @@ void Plot2d_Curve::updatePlotItem( QwtPlotItem* theItem ) QwtSymbol::Style ms = Plot2d::plot2qwtMarker( getMarker() ); aCurve->setPen( QPen( getColor(), getLineWidth(), ps ) ); - aCurve->setSymbol( QwtSymbol( ms, QBrush( getColor() ), + aCurve->setSymbol( new QwtSymbol( ms, QBrush( getColor() ), QPen( getColor() ), QSize( myMarkerSize, myMarkerSize ) ) ); - aCurve->setData( horData(), verData(), nbPoints() ); + aCurve->setSamples( horData(), verData(), nbPoints() ); + //aCurve->setLegendAttribute( QwtPlotCurve::LegendShowSymbol,true );//ema:TODO } /*! @@ -301,7 +302,7 @@ bool Plot2d_Curve::existMarker( const QwtPlot* thePlot, const QwtSymbol::Style t if( anItem && anItem->rtti() == rtti() ) { QwtPlotCurve* crv = dynamic_cast( anItem ); if ( crv ) { - QwtSymbol::Style aStyle = crv->symbol().style(); + QwtSymbol::Style aStyle = crv->symbol()->style(); QColor aColor = crv->pen().color(); Qt::PenStyle aLine = crv->pen().style(); if ( aStyle == typeMarker && closeColors( aColor,color ) && aLine == typeLine ) diff --git a/src/Plot2d/Plot2d_Histogram.cxx b/src/Plot2d/Plot2d_Histogram.cxx index 2676172ff..cb5e6f392 100644 --- a/src/Plot2d/Plot2d_Histogram.cxx +++ b/src/Plot2d/Plot2d_Histogram.cxx @@ -6,10 +6,9 @@ #include -#include -#include +#include #include - +//#include #include #include @@ -95,22 +94,24 @@ void Plot2d_Histogram::setData( const QList& theXVals, /** * Returns data */ -QwtIntervalData Plot2d_Histogram::getData() const +QwtIntervalSeriesData Plot2d_Histogram::getData() const { pointList aPoints = getPointList(); int aSize = aPoints.size(); - + QVector anIntervalsVect; QwtArray anIntervals( aSize ); QwtArray aValues( aSize ); double aX; double aWidth = isAutoAssign() ? m_dDefWidth : m_dWidth; for ( int i = 0; i < aSize; i++ ) { aX = aPoints[i].x; - anIntervals[i] = QwtDoubleInterval( aX - aWidth/2, aX + aWidth/2 ); - aValues[i] = aPoints[i].y; + //anIntervals[i] = QwtDoubleInterval( aX - aWidth/2, aX + aWidth/2 ); + //aValues[i] = aPoints[i].y; + QwtIntervalSample anInt( aPoints[i].y, QwtDoubleInterval( aX - aWidth/2, aX + aWidth/2 ) ); + anIntervalsVect.append( anInt ); } - return QwtIntervalData( anIntervals, aValues ); + return QwtIntervalSeriesData( anIntervalsVect ); } /** diff --git a/src/Plot2d/Plot2d_Histogram.h b/src/Plot2d/Plot2d_Histogram.h index 7703c8213..8f750e1a5 100644 --- a/src/Plot2d/Plot2d_Histogram.h +++ b/src/Plot2d/Plot2d_Histogram.h @@ -14,7 +14,7 @@ class QString; class QColor; -class QwtIntervalData; +class QwtIntervalSeriesData; class PLOT2D_EXPORT Plot2d_Histogram : public Plot2d_Object { @@ -28,7 +28,7 @@ public: virtual void updatePlotItem( QwtPlotItem* ); void setData( const QList&, const QList& ); - QwtIntervalData getData() const; + QwtIntervalSeriesData getData() const; QColor getColor() const; void setColor( const QColor& ); diff --git a/src/Plot2d/Plot2d_HistogramItem.cxx b/src/Plot2d/Plot2d_HistogramItem.cxx index 9893c8a10..144d35883 100644 --- a/src/Plot2d/Plot2d_HistogramItem.cxx +++ b/src/Plot2d/Plot2d_HistogramItem.cxx @@ -11,13 +11,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include /** @@ -83,18 +83,18 @@ double Plot2d_HistogramQwtItem::baseline() const /** * Sets data to object */ -void Plot2d_HistogramQwtItem::setData( const QwtIntervalData& theData ) +void Plot2d_HistogramQwtItem::setData( const QwtIntervalSeriesData& theData ) { - m_pData->data = theData; + m_pData->data = theData.samples(); itemChanged(); } /** * Returns data from object */ -const QwtIntervalData &Plot2d_HistogramQwtItem::data() const +const QwtIntervalSeriesData &Plot2d_HistogramQwtItem::data() const { - return m_pData->data; + return QwtIntervalSeriesData( m_pData->data ); } /** @@ -120,7 +120,9 @@ QColor Plot2d_HistogramQwtItem::color() const */ QwtDoubleRect Plot2d_HistogramQwtItem::boundingRect() const { - QwtDoubleRect aRect = m_pData->data.boundingRect(); + QwtIntervalSeriesData iData( m_pData->data ); + //QwtDoubleRect aRect = m_pData->data.boundingRect(); + QwtDoubleRect aRect = iData.boundingRect(); if ( !aRect.isValid() ) return aRect; @@ -180,29 +182,29 @@ bool Plot2d_HistogramQwtItem::testHistogramAttribute( void Plot2d_HistogramQwtItem::draw( QPainter *thePainter, const QwtScaleMap& theXMap, const QwtScaleMap& theYMap, - const QRect& ) const + const QRectF& ) const { - const QwtIntervalData &iData = m_pData->data; thePainter->setPen( QPen( m_pData->color ) ); - const int x0 = theXMap.transform( baseline() ); - const int y0 = theYMap.transform( baseline() ); - + const double x0 = theXMap.transform( baseline() ); + const double y0 = theYMap.transform( baseline() ); + const QVector& iData = m_pData->data; for ( int i = 0; i < (int)iData.size(); i++ ) { + if ( m_pData->attributes & Plot2d_HistogramQwtItem::Xfy ) { - const int x2 = theXMap.transform( iData.value( i ) ); + const double x2 = theXMap.transform( iData.at(i).value ); if ( x2 == x0 ) continue; - int y1 = theYMap.transform( iData.interval( i ).minValue() ); - int y2 = theYMap.transform( iData.interval( i ).maxValue() ); + double y1 = theYMap.transform( iData.at(i).interval.minValue() ); + double y2 = theYMap.transform( iData.at(i).interval.maxValue() ); if ( y1 > y2 ) qSwap( y1, y2 ); if ( i < (int)iData.size() - 2 ) { - const int yy1 = theYMap.transform( iData.interval(i+1).minValue() ); - const int yy2 = theYMap.transform( iData.interval(i+1).maxValue() ); + const double yy1 = theYMap.transform( iData.at( i+1 ).interval.minValue() ); + const double yy2 = theYMap.transform( iData.at( i+1 ). interval.maxValue() ); if ( y2 == qwtMin( yy1, yy2 ) ) { - const int xx2 = theXMap.transform( iData.interval(i+1).minValue() ); + const double xx2 = theXMap.transform( iData.at( i+1 ).interval.minValue() ); if ( xx2 != x0 && ( ( xx2 < x0 && x2 < x0 ) || ( xx2 > x0 && x2 > x0 ) ) ) { // One pixel distance between neighboured bars @@ -213,19 +215,19 @@ void Plot2d_HistogramQwtItem::draw( QPainter *thePainter, drawBar( thePainter, Qt::Horizontal, QRect( x0, y1, x2 - x0, y2 - y1 ) ); } else { - const int y2 = theYMap.transform( iData.value( i ) ); + const double y2 = theYMap.transform( iData.at(i).value ); if ( y2 == y0 ) continue; - int x1 = theXMap.transform( iData.interval( i ).minValue() ); - int x2 = theXMap.transform( iData.interval( i ).maxValue() ); + double x1 = theXMap.transform( iData.at( i ).interval.minValue() ); + double x2 = theXMap.transform( iData.at( i ).interval.maxValue() ); if ( x1 > x2 ) qSwap( x1, x2 ); if ( i < (int)iData.size() - 2 ) { - const int xx1 = theXMap.transform( iData.interval(i+1).minValue() ); - const int xx2 = theXMap.transform( iData.interval(i+1).maxValue() ); + const double xx1 = theXMap.transform( iData.at( i+1 ).interval.minValue() ); + const double xx2 = theXMap.transform( iData.at( i+1 ).interval.maxValue() ); if ( x2 == qwtMin( xx1, xx2 ) ) { - const int yy2 = theYMap.transform( iData.value(i+1) ); + const double yy2 = theYMap.transform( iData.at( i+1 ).value ); if ( yy2 != y0 && ( ( yy2 < y0 && y2 < y0 ) || ( yy2 > y0 && y2 > y0 ) ) ) { // One pixel distance between neighboured bars @@ -349,9 +351,12 @@ void Plot2d_HistogramItem::updateLegend( QwtLegend* theLegend ) const int aSize = aFMetrics.height(); QwtSymbol aSymbol( QwtSymbol::Rect, QBrush( color() ), QPen( color() ), QSize( aSize, aSize ) ); - anItem->setSymbol( aSymbol ); - anItem->setIdentifierMode( theLegend->identifierMode() - | QwtLegendItem::ShowSymbol ); + //anItem->setSymbol( aSymbol ); + //anItem->setIdentifierMode( theLegend->identifierMode() + // | QwtLegendItem::ShowSymbol ); + QPixmap aPixMap( 8, 8); + aPixMap.fill( color() ); + anItem->setIdentifier( aPixMap ); anItem->update(); } @@ -367,26 +372,25 @@ void Plot2d_HistogramItem::draw( QPainter *thePainter, Plot2d_HistogramItem* anItem = (Plot2d_HistogramItem*)this; anItem->m_BarItems.clear(); - const QwtIntervalData &iData = m_pData->data; thePainter->setPen( QPen( m_pData->color ) ); - const int x0 = theXMap.transform( baseline() ); - const int y0 = theYMap.transform( baseline() ); - + const double x0 = theXMap.transform( baseline() ); + const double y0 = theYMap.transform( baseline() ); + const QVector& iData = m_pData->data; for ( int i = 0; i < (int)iData.size(); i++ ) { if ( m_pData->attributes & Plot2d_HistogramItem::Xfy ) { - const int x2 = theXMap.transform( iData.value( i ) ); + const double x2 = theXMap.transform( iData.at(i).value ); if ( x2 == x0 ) continue; - int y1 = theYMap.transform( iData.interval( i ).minValue() ); - int y2 = theYMap.transform( iData.interval( i ).maxValue() ); + double y1 = theYMap.transform( iData.at(i).interval.minValue() ); + double y2 = theYMap.transform( iData.at(i).interval.maxValue() ); if ( y1 > y2 ) qSwap( y1, y2 ); if ( i < (int)iData.size() - 2 ) { - const int yy1 = theYMap.transform( iData.interval(i+1).minValue() ); - const int yy2 = theYMap.transform( iData.interval(i+1).maxValue() ); + const double yy1 = theYMap.transform( iData.at( i+1 ).interval.minValue() ); + const double yy2 = theYMap.transform( iData.at( i+1 ).interval.maxValue() ); if ( y2 == qwtMin( yy1, yy2 ) ) { - const int xx2 = theXMap.transform( iData.interval(i+1).minValue() ); + const double xx2 = theXMap.transform( iData.at( i+1 ).interval.minValue() ); if ( xx2 != x0 && ( ( xx2 < x0 && x2 < x0 ) || ( xx2 > x0 && x2 > x0 ) ) ) { // One pixel distance between neighboured bars @@ -400,19 +404,19 @@ void Plot2d_HistogramItem::draw( QPainter *thePainter, anItem->m_BarItems.append( aRect ); } else { - const int y2 = theYMap.transform( iData.value( i ) ); + const double y2 = theYMap.transform( iData.at( i ).value ); if ( y2 == y0 ) continue; - int x1 = theXMap.transform( iData.interval( i ).minValue() ); - int x2 = theXMap.transform( iData.interval( i ).maxValue() ); + double x1 = theXMap.transform( iData.at( i ).interval.minValue() ); + double x2 = theXMap.transform( iData.at( i ).interval.maxValue() ); if ( x1 > x2 ) qSwap( x1, x2 ); if ( i < (int)iData.size() - 2 ) { - const int xx1 = theXMap.transform( iData.interval(i+1).minValue() ); - const int xx2 = theXMap.transform( iData.interval(i+1).maxValue() ); + const double xx1 = theXMap.transform( iData.at( i+1 ).interval.minValue() ); + const double xx2 = theXMap.transform( iData.at( i+1 ).interval.maxValue() ); if ( x2 == qwtMin( xx1, xx2 ) ) { - const int yy2 = theYMap.transform( iData.value(i+1) ); + const double yy2 = theYMap.transform(iData.at( i+1 ).value ); if ( yy2 != y0 && ( ( yy2 < y0 && y2 < y0 ) || ( yy2 > y0 && y2 > y0 ) ) ) { // One pixel distance between neighboured bars diff --git a/src/Plot2d/Plot2d_HistogramItem.h b/src/Plot2d/Plot2d_HistogramItem.h index e5be0e0a1..6188e16d9 100644 --- a/src/Plot2d/Plot2d_HistogramItem.h +++ b/src/Plot2d/Plot2d_HistogramItem.h @@ -14,12 +14,13 @@ #include #include #include "qwt_plot_item.h" -#include "qwt_interval_data.h" +#include "qwt_series_data.h" +#include "qwt_compat.h" #include "QColor" #include -class QwtIntervalData; +class QwtIntervalSeriesData; class QwtLegend; class QString; @@ -29,7 +30,7 @@ protected: class PrivateData { public: int attributes; - QwtIntervalData data; + QVector data; QColor color; double reference; }; @@ -38,8 +39,8 @@ public: explicit Plot2d_HistogramQwtItem( const QwtText& ); virtual ~Plot2d_HistogramQwtItem(); - void setData( const QwtIntervalData& ); - const QwtIntervalData& data() const; + void setData( const QwtIntervalSeriesData& ); + const QwtIntervalSeriesData& data() const; void setColor( const QColor & ); QColor color() const; @@ -47,7 +48,7 @@ public: virtual QwtDoubleRect boundingRect() const; virtual int rtti() const; virtual void draw( QPainter *, const QwtScaleMap &xMap, - const QwtScaleMap &yMap, const QRect & ) const; + const QwtScaleMap &yMap, const QRectF & ) const; void setBaseline( double ); double baseline() const; diff --git a/src/Plot2d/Plot2d_Object.cxx b/src/Plot2d/Plot2d_Object.cxx index 8de33b353..5beb397d6 100755 --- a/src/Plot2d/Plot2d_Object.cxx +++ b/src/Plot2d/Plot2d_Object.cxx @@ -79,7 +79,7 @@ void Plot2d_Object::updatePlotItem( QwtPlotItem* theItem ) return; if ( theItem->yAxis() != getYAxis() || theItem->xAxis() != getXAxis() ) { - theItem->setAxis( getXAxis(), getYAxis() ); + theItem->setAxes( getXAxis(), getYAxis() ); QwtPlot* aPlot = theItem->plot(); theItem->detach(); diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx index 5039740b6..603bbd3b5 100755 --- a/src/Plot2d/Plot2d_ViewFrame.cxx +++ b/src/Plot2d/Plot2d_ViewFrame.cxx @@ -54,6 +54,9 @@ #include #include #include +#include +#include +#include #include #include @@ -178,7 +181,7 @@ Plot2d_ViewFrame::Plot2d_ViewFrame( QWidget* parent, const QString& title ) /* Initial Setup - get from the preferences */ readPreferences(); - myPlot->setMargin( 5 ); + aLayout->setMargin( 5 ); setCurveType( myCurveType, false ); setXGrid( myXGridMajorEnabled, myXGridMaxMajor, myXGridMinorEnabled, myXGridMaxMinor, false ); setYGrid( myYGridMajorEnabled, myYGridMaxMajor, myYGridMinorEnabled, myYGridMaxMinor, @@ -911,26 +914,31 @@ int Plot2d_ViewFrame::testOperation( const QMouseEvent& me ) const int zoomBtn = Qt::ControlModifier | Qt::LeftButton; const int panBtn = Qt::ControlModifier | Qt::MidButton; const int fitBtn = Qt::ControlModifier | Qt::RightButton; - - switch (btn) - { - case zoomBtn: - { - QPixmap zoomPixmap (imageZoomCursor); - QCursor zoomCursor (zoomPixmap); - myPlot->canvas()->setCursor( zoomCursor ); - return ZoomId; - } - case panBtn: + + if ( btn == zoomBtn ) { + QPixmap zoomPixmap( imageZoomCursor ); + QCursor zoomCursor( zoomPixmap ); + myPlot->canvas()->setCursor( zoomCursor ); + return ZoomId; + } else if ( btn == panBtn ) { myPlot->canvas()->setCursor( QCursor( Qt::SizeAllCursor ) ); return PanId; - case fitBtn: + } else if ( btn == fitBtn ) { myPlot->canvas()->setCursor( QCursor( Qt::PointingHandCursor ) ); return FitAreaId; - default : + } else { return NoOpId; } } +/*! + Protected virtual method called by onSettings() slot, + can be redefined to customize the dialog box appearance. + \param theDlg a pointer to the 2D plot settings dialog box instance + \sa onSettings() +*/ +void Plot2d_ViewFrame::setupSettingsDlg( Plot2d_SetupViewDlg* /*theDlg*/ ) +{ +} /*! Protected virtual method called by onSettings() slot, @@ -1192,9 +1200,10 @@ void Plot2d_ViewFrame::setMarkerSize( const int size, bool update ) QwtPlotCurve* crv = it.key(); if ( crv ) { - QwtSymbol aSymbol = crv->symbol(); - aSymbol.setSize( myMarkerSize, myMarkerSize ); - crv->setSymbol( aSymbol ); + const QwtSymbol* aSymbol = crv->symbol(); + QwtSymbol* aSymbolNew = new QwtSymbol( aSymbol->style(), aSymbol->brush(), aSymbol->pen(), aSymbol->size() ); + aSymbolNew->setSize( myMarkerSize, myMarkerSize ); + crv->setSymbol( aSymbolNew ); } } if ( update ) @@ -1748,7 +1757,7 @@ Plot2d_Plot2d::Plot2d_Plot2d( QWidget* parent ) myIsPolished( false ) { myPlotZoomer = new Plot2d_QwtPlotZoomer( QwtPlot::xBottom, QwtPlot::yLeft, canvas() ); - myPlotZoomer->setSelectionFlags( QwtPicker::DragSelection | QwtPicker::CornerToCorner ); + //myPlotZoomer->setSelectionFlags( QwtPicker::DragSelection | QwtPicker::CornerToCorner ); myPlotZoomer->setTrackerMode( QwtPicker::AlwaysOff ); myPlotZoomer->setRubberBand( QwtPicker::RectRubberBand ); myPlotZoomer->setRubberBandPen( QColor( Qt::green ) ); @@ -1841,10 +1850,12 @@ void Plot2d_Plot2d::setPickerMousePattern( int button, int state ) /*! Sets the flag saying that QwtPlot geometry has been fully defined. */ -void Plot2d_Plot2d::polish() +bool Plot2d_Plot2d::event( QEvent* e ) { - QwtPlot::polish(); - myIsPolished = true; + if( e->type() == QEvent::Polish ){ + myIsPolished = true; + } + return QwtPlot::event( e ); } @@ -1998,7 +2009,8 @@ bool Plot2d_ViewFrame::print( const QString& file, const QString& format ) const if( pd ) { - myPlot->print( *pd ); + QwtPlotRenderer aRend; + aRend.renderTo( myPlot, *pd ); res = true; delete pd; } @@ -2010,10 +2022,10 @@ bool Plot2d_ViewFrame::print( const QString& file, const QString& format ) const /** * Print Plot2d window */ -void Plot2d_ViewFrame::printPlot( QPainter* p, const QRect& rect, - const QwtPlotPrintFilter& filter ) const +void Plot2d_ViewFrame::printPlot( QPainter* p, const QRectF& rect) const { - myPlot->print( p, rect, filter ); + QwtPlotRenderer aRend; + aRend.render( myPlot, p, rect ); } /*! diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h index 76291eb42..350dbdc60 100755 --- a/src/Plot2d/Plot2d_ViewFrame.h +++ b/src/Plot2d/Plot2d_ViewFrame.h @@ -143,8 +143,7 @@ public: void setEnableAxis( const QwtPlot::Axis&, const bool& ); virtual bool print( const QString& file, const QString& format ) const; - void printPlot( QPainter* p, const QRect& rect, - const QwtPlotPrintFilter& = QwtPlotPrintFilter() ) const; + void printPlot( QPainter* p, const QRectF& rect) const; QString getVisualParameters(); void setVisualParameters( const QString& parameters ); @@ -252,9 +251,8 @@ public: QwtPlotGrid* grid() { return myGrid; }; QwtPlotZoomer* getZoomer() { return myPlotZoomer; } - -public slots: - virtual void polish(); + //to handle QEvent::Polish + virtual bool event( QEvent* ); protected: QwtPlotGrid* myGrid; diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx index 5e2eb6a60..9088e4fdb 100755 --- a/src/Plot2d/Plot2d_ViewWindow.cxx +++ b/src/Plot2d/Plot2d_ViewWindow.cxx @@ -716,7 +716,7 @@ void Plot2d_ViewWindow::onPrintView() } QMap< QwtPlotCurve*, QPen > aCurvToPen; - QMap< QwtPlotCurve*, QwtSymbol > aCurvToSymbol; + QMap< QwtPlotCurve*, const QwtSymbol* > aCurvToSymbol; if ( needColorCorrection ) { @@ -741,14 +741,12 @@ void Plot2d_ViewWindow::onPrintView() aCurve->setPen( aPen ); // symbol - QwtSymbol aSymbol = aCurve->symbol(); + const QwtSymbol* aSymbol = aCurve->symbol(); aCurvToSymbol[ aCurve ] = aSymbol; - aPen = aSymbol.pen(); + aPen = aSymbol->pen(); aPen.setColor( QColor( 0, 0, 0 ) ); aPen.setWidthF( 1.5 ); - aSymbol.setPen( aPen ); - - aCurve->setSymbol( aSymbol ); + aCurve->setSymbol( new QwtSymbol( aSymbol->style(), aSymbol->brush(), aPen, aSymbol->size() ) ); } } diff --git a/src/Prs/.cvsignore b/src/Prs/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/Prs/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/PyConsole/.cvsignore b/src/PyConsole/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/PyConsole/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/PyConsole/PyConsole.h b/src/PyConsole/PyConsole.h index d27c40c0f..181e73cf9 100644 --- a/src/PyConsole/PyConsole.h +++ b/src/PyConsole/PyConsole.h @@ -1,4 +1,7 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro index 7ad871851..c57e40b50 100644 --- a/src/PyConsole/PyConsole.pro +++ b/src/PyConsole/PyConsole.pro @@ -4,7 +4,7 @@ win32:TEMPLATE = vclib include(../Common.pro) INCLUDEPATH += $$(PYTHONINC) -unix:LIBS += -L$$(PYTHONLIB) -lpython2.5 -lSUIT -lPyInterp +unix:LIBS += -L$$(PYTHONLIB) -lpython2.7 -lSUIT -lPyInterp win32:LIBS += -L$$(PYTHONLIB) -lSUIT -lPyInterp -lQtx win32:CONFIG_MODE= $$(CONFIG_MODE) contains( CONFIG_MODE, debug ) { diff --git a/src/PyConsole/PyConsole_Console.cxx b/src/PyConsole/PyConsole_Console.cxx index 320753af6..7874a1c17 100644 --- a/src/PyConsole/PyConsole_Console.cxx +++ b/src/PyConsole/PyConsole_Console.cxx @@ -1,4 +1,7 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h index 62df6a45b..b1489356f 100644 --- a/src/PyConsole/PyConsole_Console.h +++ b/src/PyConsole/PyConsole_Console.h @@ -1,4 +1,7 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 diff --git a/src/PyConsole/PyConsole_Editor.cxx b/src/PyConsole/PyConsole_Editor.cxx index 449ac23ec..c42530517 100644 --- a/src/PyConsole/PyConsole_Editor.cxx +++ b/src/PyConsole/PyConsole_Editor.cxx @@ -1,6 +1,6 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// Copyright (C) 2003-2007 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 @@ -370,8 +370,11 @@ void PyConsole_Editor::execAndWait( const QString& command ) */ void PyConsole_Editor::handleReturn() { - // get last line - QTextBlock par = document()->end().previous(); + //SBH: Porting to the Qt v4.7.2: Since Qt 4.4. "lastBlock()" is more + //suitable method for retrieving last valid block of text from QTextDocument + //than "document()->end().previous()". Moreover, in the Acheron this + //obsolete construction returns invalid block, which leads to issues. + QTextBlock par = document()->lastBlock(); if ( !par.isValid() ) return; // get command @@ -407,7 +410,7 @@ void PyConsole_Editor::dropEvent( QDropEvent* event ) QPoint pos = event->pos(); QTextCursor cur = cursorForPosition( event->pos() ); // if the position is not in the last line move it to the end of the command line - if ( cur.position() < document()->end().previous().position() + PROMPT_SIZE ) { + if ( cur.position() < document()->lastBlock().position() + PROMPT_SIZE ) { moveCursor( QTextCursor::End ); pos = cursorRect().center(); } @@ -444,7 +447,7 @@ void PyConsole_Editor::mouseReleaseEvent( QMouseEvent* event ) text = QApplication::clipboard()->text( QClipboard::Clipboard ); QTextCursor cur = cursorForPosition( event->pos() ); // if the position is not in the last line move it to the end of the command line - if ( cur.position() < document()->end().previous().position() + PROMPT_SIZE ) { + if ( cur.position() < document()->lastBlock().position() + PROMPT_SIZE ) { moveCursor( QTextCursor::End ); } else { @@ -561,7 +564,7 @@ void PyConsole_Editor::keyPressEvent( QKeyEvent* event ) // set history browsing mode myCmdInHistory = myHistory.count(); // remember current command - QTextBlock par = document()->end().previous(); + QTextBlock par = document()->lastBlock(); myCurrentCommand = par.text().remove( 0, PROMPT_SIZE ); } if ( myCmdInHistory > 0 ) { @@ -705,7 +708,7 @@ void PyConsole_Editor::keyPressEvent( QKeyEvent* event ) // set history browsing mode myCmdInHistory = myHistory.count(); // remember current command - QTextBlock par = document()->end().previous(); + QTextBlock par = document()->lastBlock(); myCurrentCommand = par.text().remove( 0, PROMPT_SIZE ); } if ( myCmdInHistory > 0 ) { @@ -824,13 +827,13 @@ void PyConsole_Editor::keyPressEvent( QKeyEvent* event ) if ( cur.hasSelection() ) { cut(); } - else if ( cur.position() > document()->end().previous().position() + PROMPT_SIZE ) { + else if ( cur.position() > document()->lastBlock().position() + PROMPT_SIZE ) { if ( shftPressed ) { moveCursor( QTextCursor::PreviousWord, QTextCursor::KeepAnchor ); textCursor().removeSelectedText(); } else if ( ctrlPressed ) { - cur.setPosition( document()->end().previous().position() + PROMPT_SIZE, + cur.setPosition( document()->lastBlock().position() + PROMPT_SIZE, QTextCursor::KeepAnchor ); setTextCursor( cur ); textCursor().removeSelectedText(); @@ -840,7 +843,7 @@ void PyConsole_Editor::keyPressEvent( QKeyEvent* event ) } } else { - cur.setPosition( document()->end().previous().position() + PROMPT_SIZE ); + cur.setPosition( document()->lastBlock().position() + PROMPT_SIZE ); setTextCursor( cur ); horizontalScrollBar()->setValue( horizontalScrollBar()->minimum() ); } @@ -856,7 +859,7 @@ void PyConsole_Editor::keyPressEvent( QKeyEvent* event ) if ( cur.hasSelection() ) { cut(); } - else if ( cur.position() > document()->end().previous().position() + PROMPT_SIZE-1 ) { + else if ( cur.position() > document()->lastBlock().position() + PROMPT_SIZE-1 ) { if ( shftPressed ) { moveCursor( QTextCursor::NextWord, QTextCursor::KeepAnchor ); textCursor().removeSelectedText(); @@ -870,7 +873,7 @@ void PyConsole_Editor::keyPressEvent( QKeyEvent* event ) } } else { - cur.setPosition( document()->end().previous().position() + PROMPT_SIZE ); + cur.setPosition( document()->lastBlock().position() + PROMPT_SIZE ); setTextCursor( cur ); horizontalScrollBar()->setValue( horizontalScrollBar()->minimum() ); } @@ -914,7 +917,7 @@ void PyConsole_Editor::customEvent( QEvent* event ) // clear command buffer myCommandBuffer.truncate( 0 ); // add caret return line if necessary - QTextBlock par = document()->end().previous(); + QTextBlock par = document()->lastBlock(); QString txt = par.text(); txt.truncate( txt.length() - 1 ); // IPAL19397 : addText moved to handleReturn() method @@ -935,7 +938,7 @@ void PyConsole_Editor::customEvent( QEvent* event ) // extend command buffer (multi-line command) myCommandBuffer.append( "\n" ); // add caret return line if necessary - QTextBlock par = document()->end().previous(); + QTextBlock par = document()->lastBlock(); QString txt = par.text(); txt.truncate( txt.length() - 1 ); // IPAL19397 : addText moved to handleReturn() method @@ -1022,11 +1025,11 @@ void PyConsole_Editor::cut() if ( cur.hasSelection() ) { QApplication::clipboard()->setText( cur.selectedText() ); int startSelection = cur.selectionStart(); - if ( startSelection < document()->end().previous().position() + PROMPT_SIZE ) - startSelection = document()->end().previous().position() + PROMPT_SIZE; + if ( startSelection < document()->lastBlock().position() + PROMPT_SIZE ) + startSelection = document()->lastBlock().position() + PROMPT_SIZE; int endSelection = cur.selectionEnd(); - if ( endSelection < document()->end().previous().position() + PROMPT_SIZE ) - endSelection = document()->end().previous().position() + PROMPT_SIZE; + if ( endSelection < document()->lastBlock().position() + PROMPT_SIZE ) + endSelection = document()->lastBlock().position() + PROMPT_SIZE; cur.setPosition( startSelection ); cur.setPosition( endSelection, QTextCursor::KeepAnchor ); horizontalScrollBar()->setValue( horizontalScrollBar()->minimum() ); @@ -1046,18 +1049,18 @@ void PyConsole_Editor::paste() QTextCursor cur = textCursor(); if ( cur.hasSelection() ) { int startSelection = cur.selectionStart(); - if ( startSelection < document()->end().previous().position() + PROMPT_SIZE ) - startSelection = document()->end().previous().position() + PROMPT_SIZE; + if ( startSelection < document()->lastBlock().position() + PROMPT_SIZE ) + startSelection = document()->lastBlock().position() + PROMPT_SIZE; int endSelection = cur.selectionEnd(); - if ( endSelection < document()->end().previous().position() + PROMPT_SIZE ) - endSelection = document()->end().previous().position() + PROMPT_SIZE; + if ( endSelection < document()->lastBlock().position() + PROMPT_SIZE ) + endSelection = document()->lastBlock().position() + PROMPT_SIZE; cur.setPosition( startSelection ); cur.setPosition( endSelection, QTextCursor::KeepAnchor ); horizontalScrollBar()->setValue( horizontalScrollBar()->minimum() ); setTextCursor( cur ); textCursor().removeSelectedText(); } - if ( textCursor().position() < document()->end().previous().position() + PROMPT_SIZE ) + if ( textCursor().position() < document()->lastBlock().position() + PROMPT_SIZE ) moveCursor( QTextCursor::End ); QTextEdit::paste(); } diff --git a/src/PyConsole/PyConsole_Editor.h b/src/PyConsole/PyConsole_Editor.h index a53233a10..2947b67b6 100644 --- a/src/PyConsole/PyConsole_Editor.h +++ b/src/PyConsole/PyConsole_Editor.h @@ -1,4 +1,4 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/src/PyConsole/PyConsole_Interp.cxx b/src/PyConsole/PyConsole_Interp.cxx index 003d59f39..d3dcb1255 100644 --- a/src/PyConsole/PyConsole_Interp.cxx +++ b/src/PyConsole/PyConsole_Interp.cxx @@ -1,4 +1,4 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/src/PyConsole/PyConsole_Interp.h b/src/PyConsole/PyConsole_Interp.h index 5e0b1f645..d4bf34ef3 100644 --- a/src/PyConsole/PyConsole_Interp.h +++ b/src/PyConsole/PyConsole_Interp.h @@ -1,4 +1,4 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/src/PyInterp/.cvsignore b/src/PyInterp/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/PyInterp/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/PyInterp/PyInterp.pro b/src/PyInterp/PyInterp.pro index 5ae903fa6..43d78d2b0 100644 --- a/src/PyInterp/PyInterp.pro +++ b/src/PyInterp/PyInterp.pro @@ -4,7 +4,7 @@ win32:TEMPLATE = vclib include(../Common.pro) INCLUDEPATH += $$(PYTHONINC) -unix:LIBS += -lEvent -L$$(PYTHONLIB) -lpython2.5 +unix:LIBS += -lEvent -L$$(PYTHONLIB) -lpython2.7 win32:LIBS += -lEvent -L$$(PYTHONLIB) win32:CONFIG_MODE= $$(CONFIG_MODE) contains( CONFIG_MODE, debug ) { diff --git a/src/Qtx/.cvsignore b/src/Qtx/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/Qtx/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/Qtx/QtxDialog.cxx b/src/Qtx/QtxDialog.cxx index 64e43c854..30666a40f 100755 --- a/src/Qtx/QtxDialog.cxx +++ b/src/Qtx/QtxDialog.cxx @@ -437,7 +437,7 @@ QSize QtxDialog::Border::minimumSizeHint() const \param wf dialog box flags (Qt::WindowFlags) */ QtxDialog::QtxDialog( QWidget* parent, bool modal, bool allowResize, const int f, Qt::WindowFlags wf ) -: QDialog( parent, (Qt::WindowFlags)( wf | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::Dialog | +: QDialog( parent, (Qt::WindowFlags)( wf | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint | Qt::Dialog | #ifdef WIN32 ( allowResize ? 0 : Qt::FramelessWindowHint ) | #endif diff --git a/src/STD/.cvsignore b/src/STD/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/STD/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/SUIT/.cvsignore b/src/SUIT/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/SUIT/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/SUITApp/.cvsignore b/src/SUITApp/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/SUITApp/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/SVTK/.cvsignore b/src/SVTK/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/SVTK/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro index cad10b359..853778dc2 100644 --- a/src/SVTK/SVTK.pro +++ b/src/SVTK/SVTK.pro @@ -18,7 +18,7 @@ win32:LIBS *= -L$(QTLIB) win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml win32:DEFINES += WNT WIN32 -DEFINES += SVTK_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS +DEFINES += SVTK_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=3 OCC_VERSION_MAINTENANCE=5 LIN LINTEL CSFDB No_Exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS include(../Translations.pro) include(../Resources.pro) diff --git a/src/Style/.cvsignore b/src/Style/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/Style/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/TableViewer/.cvsignore b/src/TableViewer/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/TableViewer/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/TableViewer/TableViewer.pro b/src/TableViewer/TableViewer.pro index 753f0a2df..f89b9bc40 100644 --- a/src/TableViewer/TableViewer.pro +++ b/src/TableViewer/TableViewer.pro @@ -12,7 +12,7 @@ win32:LIBS *= -L$(QTLIB) win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml win32:DEFINES += WNT WIN32 -DEFINES += TABLEVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS +DEFINES += TABLEVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=3 OCC_VERSION_MAINTENANCE=5 LIN LINTEL CSFDB No_Exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS include(../Translations.pro) include(../Resources.pro) diff --git a/src/TableViewer/TableViewer_Tool.cxx b/src/TableViewer/TableViewer_Tool.cxx index 10f94ebf5..f193b1a3f 100755 --- a/src/TableViewer/TableViewer_Tool.cxx +++ b/src/TableViewer/TableViewer_Tool.cxx @@ -37,7 +37,7 @@ TCollection_ExtendedString TableViewer_Tool::ToExtString( const QString& src ) return TCollection_ExtendedString(); Standard_Integer len = src.length(); - Standard_ExtString extStr = new Standard_ExtCharacter [( len + 1 ) * 2]; + Standard_ExtCharacter* extStr = new Standard_ExtCharacter [( len + 1 ) * 2]; memcpy( extStr, src.unicode(), len * 2 ); extStr[len] = 0; diff --git a/src/VTKViewer/.cvsignore b/src/VTKViewer/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/src/VTKViewer/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro index e8d028f35..685345c3a 100644 --- a/src/VTKViewer/VTKViewer.pro +++ b/src/VTKViewer/VTKViewer.pro @@ -16,7 +16,7 @@ win32:LIBS *= -L$(QTLIB) win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml win32:DEFINES += WNT WIN32 -DEFINES += VTKVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS +DEFINES += VTKVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=3 OCC_VERSION_MAINTENANCE=5 LIN LINTEL CSFDB No_Exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS include(../Translations.pro) include(../Resources.pro)