]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Compilation by CMake.
authorouv <ouv@opencascade.com>
Tue, 23 Jul 2013 15:01:37 +0000 (15:01 +0000)
committerouv <ouv@opencascade.com>
Tue, 23 Jul 2013 15:01:37 +0000 (15:01 +0000)
22 files changed:
CMakeLists.txt
adm_local/cmake_files/FindGUI.cmake
adm_local/unix/config_files/CMakeLists.txt
adm_local/unix/config_files/check_GraphicsView.m4
src/CMakeLists.txt
src/GraphicsView/CMakeLists.txt [new file with mode: 0755]
src/ImageComposer/CMakeLists.txt [new file with mode: 0755]
src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
src/ImageComposer/ImageComposer_ColorMaskOperator.h
src/ImageComposer/ImageComposer_CropOperator.cxx
src/ImageComposer/ImageComposer_CropOperator.h
src/ImageComposer/ImageComposer_CutOperator.cxx
src/ImageComposer/ImageComposer_CutOperator.h
src/ImageComposer/ImageComposer_FuseOperator.cxx
src/ImageComposer/ImageComposer_FuseOperator.h
src/ImageComposer/ImageComposer_Image.cxx
src/ImageComposer/ImageComposer_Image.h
src/ImageComposer/ImageComposer_Operator.cxx
src/ImageComposer/ImageComposer_Operator.h
src/LightApp/CMakeLists.txt
src/LightApp/LightApp_GVSelector.cxx
src/SalomeApp/CMakeLists.txt

index 0f302a1c266f653c358727f0aac13917fb6cd651..399f5c4a3828cd5e4803591e6369312ad8a6c63c 100755 (executable)
@@ -45,6 +45,7 @@ OPTION(SALOME_USE_VTKVIEWER "Enable VTK visualization (Mandatory in classic conf
 OPTION(SALOME_USE_SALOMEOBJECT "Enable Salome Object (Mandatory in classic configurations)" ON)
 OPTION(SALOME_USE_OCCVIEWER "Enable OCC visualization (Mandatory in classic configurations)" ON)
 OPTION(SALOME_USE_GLVIEWER "Enable OpenGL visualization (Mandatory in classic configurations)" ON)
+OPTION(SALOME_USE_GRAPHICSVIEW "Enable GraphicsView visualization (Mandatory in classic configurations)" ON)
 OPTION(SALOME_USE_PLOT2DVIEWER "Enable Plot2D visualization (Mandatory in classic configurations)" ON)
 OPTION(SALOME_USE_PYCONSOLE "Enable Python GUI interface (Mandatory in classic configurations)" ON)
 OPTION(SALOME_USE_SUPERVGRAPHVIEWER "Enable Supervision visualization (Mandatory in classic configurations)" ON)
index 83cd65bad8e8832269f7c5642c980781a362a35f..3147be3e860d3cdb8fc4c811c0420ace0cd8dab8 100644 (file)
@@ -25,6 +25,7 @@ FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(DDS DDS ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(Event Event ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GLViewer GLViewer ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(GraphicsView GraphicsView ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(LightApp LightApp ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(LogWindow LogWindow ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome)
index 3c257a37a57ee016baa8a34b5839cdf348504c29..0b0d3eb20bfcf4775ff3fbd90d93482f9f4d3f4f 100755 (executable)
@@ -23,6 +23,7 @@
 SET(dist_admlocalm4_DATA
   check_disable_Corba.m4
   check_GLViewer.m4
+  check_GraphicsView.m4
   check_GUI.m4
   check_msg2qm.m4
   check_OCCViewer.m4
index 9082b94245c89c3aaeec9f4dd46c5ddaffa2e302..004a291deb32ad7fbbaec54b866309402aa121d0 100644 (file)
@@ -1,3 +1,25 @@
+dnl Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl
+dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
+
 #
 # Check configure option --disable-graphicsView=[yes|no|DIR] taking into account that
 # DISABLE_GRAPHICSVIEW may be already set during build_configure,
index 6d2b582a7afe93fabf9d3607d9d312266c0b643c..36b5dca36afb961c9937feb24fa33f6bc2a726e1 100755 (executable)
@@ -36,6 +36,7 @@ SET(SUBDIRS_COMMON
   Prs
   Event
   OpenGLUtils
+  ImageComposer
   GUI_PY
 )
 
@@ -53,6 +54,13 @@ IF(SALOME_USE_GLVIEWER)
   SET(SUBDIRS_GLVIEWER GLViewer)
 ENDIF(SALOME_USE_GLVIEWER)
 
+##
+# GL viewer
+##
+IF(SALOME_USE_GRAPHICSVIEW)
+  SET(SUBDIRS_GRAPHICSVIEW GraphicsView)
+ENDIF(SALOME_USE_GRAPHICSVIEW)
+
 ##
 # VTK viewer
 ##
@@ -148,6 +156,7 @@ SET(SUBDIRS
   ${SUBDIRS_OBJECT}
   ${SUBDIRS_VIEWERTOOLS}
   ${SUBDIRS_GLVIEWER}
+  ${SUBDIRS_GRAPHICSVIEW}
   ${SUBDIRS_VTKVIEWER}
   ${SUBDIRS_OCCVIEWER}
   ${SUBDIRS_PLOT2DVIEWER}
diff --git a/src/GraphicsView/CMakeLists.txt b/src/GraphicsView/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..ef4f1a4
--- /dev/null
@@ -0,0 +1,76 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# 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
+#
+
+INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
+
+INCLUDE_DIRECTORIES(
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
+  ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
+  ${CMAKE_CURRENT_SOURCE_DIR}/../ImageComposer
+)
+
+SET(COMMON_LIBS
+  ${QT_LIBRARIES} 
+  suit 
+  ImageComposer 
+)
+
+SET(GUI_HEADERS
+  GraphicsView_PrsPropDlg.h
+  GraphicsView_Scene.h
+  GraphicsView_Selector.h
+  GraphicsView_ViewFrame.h
+  GraphicsView_ViewManager.h
+  GraphicsView_ViewPort.h
+  GraphicsView_Viewer.h
+)
+
+QT4_WRAP_CPP(GUI_HEADERS_MOC ${GUI_HEADERS})
+
+SET(GraphicsView_SOURCES
+  GraphicsView_Object.cxx
+  GraphicsView_Scene.cxx
+  GraphicsView_Selector.cxx
+  GraphicsView_Viewer.cxx
+  GraphicsView_ViewFrame.cxx
+  GraphicsView_ViewManager.cxx
+  GraphicsView_ViewPort.cxx
+  GraphicsView_ViewTransformer.cxx
+  GraphicsView_PrsImage.cxx
+  GraphicsView_PrsImageFrame.cxx
+  GraphicsView_PrsPropDlg.cxx
+)
+
+SET(GUITS_SOURCES
+  resources/GraphicsView_images.ts
+  resources/GraphicsView_msg_en.ts
+  resources/GraphicsView_msg_fr.ts
+)
+
+ADD_LIBRARY(GraphicsView ${GraphicsView_SOURCES} ${GUI_HEADERS_MOC})
+TARGET_LINK_LIBRARIES(GraphicsView ${COMMON_LIBS})
+INSTALL(TARGETS GraphicsView DESTINATION ${GUI_salomelib_LIBS})
+
+FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${GUI_salomeinclude_HEADERS})
+QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${GUI_salomeres_DATA}")
+
+FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
+INSTALL(FILES ${GUIPNG_DATA} DESTINATION ${GUI_salomeres_DATA})
diff --git a/src/ImageComposer/CMakeLists.txt b/src/ImageComposer/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..cda4cd5
--- /dev/null
@@ -0,0 +1,53 @@
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# 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
+#
+
+INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
+
+INCLUDE_DIRECTORIES(
+  ${QT_INCLUDES}
+)
+
+SET(COMMON_LIBS
+  ${QT_LIBRARIES} 
+)
+
+SET(ImageComposer_SOURCES
+  ImageComposer_ColorMaskOperator.cxx
+  ImageComposer_CropOperator.cxx
+  ImageComposer_CutOperator.cxx
+  ImageComposer_FuseOperator.cxx
+  ImageComposer_Image.cxx
+  ImageComposer_Operator.cxx
+)
+
+ADD_LIBRARY(ImageComposer ${ImageComposer_SOURCES})
+TARGET_LINK_LIBRARIES(ImageComposer ${COMMON_LIBS})
+INSTALL(TARGETS ImageComposer DESTINATION ${GUI_salomelib_LIBS})
+
+SET(COMMON_HEADERS_H
+  ImageComposer.h
+  ImageComposer_ColorMaskOperator.h
+  ImageComposer_CropOperator.h
+  ImageComposer_CutOperator.h
+  ImageComposer_FuseOperator.h
+  ImageComposer_Image.h
+  ImageComposer_Operator.h
+)
+
+INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${GUI_salomeinclude_HEADERS})
index 9a1110679db3a28514f4f642f1b04c8602569a1a..8f0f64b25662a59cc81b468ead3f920c3069ca5a 100644 (file)
@@ -1,6 +1,6 @@
 
-#include <ImageComposer_ColorMaskOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_ColorMaskOperator.h"
+#include "ImageComposer_Image.h"
 #include <QRectF>
 #include <QRgb>
 #include <QPixmap>
index d3b6ec67c0372fd5dd5639827e3a5a7517d4eb6d..fec0c90252632fa5eb561ddcacb76c1aaefeed0e 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef IMAGE_COMPOSER_COLOR_MASK_OPERATOR_HEADER
 #define IMAGE_COMPOSER_COLOR_MASK_OPERATOR_HEADER
 
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
 #include <QColor>
 
 /**
index bacee5a7f90308d3c6d8a9b9777d0e747096e1ce..915205d270c4e7bf3cf5848409b5726f30e6578d 100644 (file)
@@ -1,6 +1,6 @@
 
-#include <ImageComposer_CropOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_CropOperator.h"
+#include "ImageComposer_Image.h"
 #include <QPixmap>
 #include <QPainter>
 
index d4a545990cb257ad7edf11a202b1ee998129ebbc..1a2525efe2bf035b9893869b2d99b5e682c901d1 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef IMAGE_COMPOSER_CROP_OPERATOR_HEADER
 #define IMAGE_COMPOSER_CROP_OPERATOR_HEADER
 
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
 #include <QColor>
 #include <QPainterPath>
 
index 07af47e45e04fea58d8efaa515c9ee154be068ee..3ecf2265e6b29b0ed9ee84f9c5c6bc87ac404fe3 100644 (file)
@@ -1,6 +1,6 @@
 
-#include <ImageComposer_CutOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_CutOperator.h"
+#include "ImageComposer_Image.h"
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
index fd12d3a2b037a49ce3f03bf6f5ba18de39661859..d85923c41c60d7e6f428b7e604ea25bc2444a93c 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef IMAGE_COMPOSER_CUT_OPERATOR_HEADER
 #define IMAGE_COMPOSER_CUT_OPERATOR_HEADER
 
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
 #include <QColor>
 
 /**
index 9012f8af97c72ca3a8f40d76a8e4236ce6f901ea..b68ad1741bf9f1fbdf0c522952fffbff79f4fe61 100644 (file)
@@ -1,6 +1,6 @@
 
-#include <ImageComposer_FuseOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_FuseOperator.h"
+#include "ImageComposer_Image.h"
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
index a6ad4c001abe8cb54158d4abd2f2ee35e4b25fff..857ad54e983372f2248fb48c83b723c152717a9b 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef IMAGE_COMPOSER_FUSE_OPERATOR_HEADER
 #define IMAGE_COMPOSER_FUSE_OPERATOR_HEADER
 
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
 #include <QColor>
 
 /**
index 1d9ede6dc05f28527f1499eb3a251abe6fb1778b..a7b1a7e6f98dec1a75a7070233265fa53b444ed5 100644 (file)
@@ -1,8 +1,8 @@
 
-#include <ImageComposer_Image.h>
-#include <ImageComposer_CropOperator.h>
-#include <ImageComposer_CutOperator.h>
-#include <ImageComposer_FuseOperator.h>
+#include "ImageComposer_Image.h"
+#include "ImageComposer_CropOperator.h"
+#include "ImageComposer_CutOperator.h"
+#include "ImageComposer_FuseOperator.h"
 #include <QPainter>
 
 QColor ImageComposer_Image::myDefaultBackground = TRANSPARENT;
index 8b53dca94c6da6a5a5de467671d0442e7358978c..fe3db0186aead11c22ece25116d4d5fdd8efbd6d 100644 (file)
@@ -3,7 +3,7 @@
 #define IMAGE_COMPOSER_IMAGE_HEADER
 
 #include <QImage>
-#include <ImageComposer.h>
+#include "ImageComposer.h"
 
 class ImageComposer_Operator;
 
index 2bf7f219c56ac29bdf1736fc0e6fa480c1819484..7a9fde0ad7eaca6a46051b9258d3d3d3c381d83f 100644 (file)
@@ -1,6 +1,6 @@
 
-#include <ImageComposer_Operator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_Operator.h"
+#include "ImageComposer_Image.h"
 #include <QPixmap>
 #include <QPainter>
 
index b54552ddb63566110c96fbebb2e7e9f11f017eca..a90b4853649c50b9c5d43056fc8e61311cf1d80f 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef IMAGE_COMPOSER_OPERATOR_HEADER
 #define IMAGE_COMPOSER_OPERATOR_HEADER
 
-#include <ImageComposer.h>
+#include "ImageComposer.h"
 #include <QColor>
 
 class QString;
index 5cfebdd16842901726e6d84fd84ba46055d84e0d..023d1b2bdf64679203e98b088f179e9fd7ff20f4 100755 (executable)
@@ -200,6 +200,16 @@ ELSE(SALOME_USE_GLVIEWER)
   ADD_DEFINITIONS("-DDISABLE_GLVIEWER")
 ENDIF(SALOME_USE_GLVIEWER)
 
+IF(SALOME_USE_GRAPHICSVIEW)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../GraphicsView)
+  SET(COMMON_HEADERS_H ${COMMON_HEADERS_H} LightApp_GVSelector.h)
+  SET(LightApp_SOURCES ${LightApp_SOURCES} LightApp_GVSelector.cxx)
+  SET(GUI_HEADERS ${GUI_HEADERS} LightApp_GVSelector.h)
+  SET(COMMON_LIBS ${COMMON_LIBS} GraphicsView)
+ELSE(SALOME_USE_GRAPHICSVIEW)
+  ADD_DEFINITIONS("-DDISABLE_GRAPHICSVIEW")
+ENDIF(SALOME_USE_GRAPHICSVIEW)
+
 IF(SALOME_USE_PLOT2DVIEWER)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Plot2d)
   ADD_DEFINITIONS(${QWT_DEFINITIONS})
index 75ed0d1ccc252fb59ed2ac6a42f79c3cf7603068..8be3a7d0eb1493d695f7b65687c922c1c92b88df 100644 (file)
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <LightApp_GVSelector.h>
+#include "LightApp_GVSelector.h"
 
 #include <GraphicsView_Object.h>
 #include <GraphicsView_Selector.h>
index 3f8042c089c8f89b889cb7a1fdf94442dafaba38..3c09fb9c197093ceea8bb0b7c018e91abbc4ddab 100755 (executable)
@@ -72,6 +72,7 @@ SET(COMMON_LIBS
   SalomePrs
   SPlot2d
   GLViewer
+  GraphicsView
   OCCViewer
   VTKViewer
   SalomeObject