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)
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)
SET(dist_admlocalm4_DATA
check_disable_Corba.m4
check_GLViewer.m4
+ check_GraphicsView.m4
check_GUI.m4
check_msg2qm.m4
check_OCCViewer.m4
+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,
Prs
Event
OpenGLUtils
+ ImageComposer
GUI_PY
)
SET(SUBDIRS_GLVIEWER GLViewer)
ENDIF(SALOME_USE_GLVIEWER)
+##
+# GL viewer
+##
+IF(SALOME_USE_GRAPHICSVIEW)
+ SET(SUBDIRS_GRAPHICSVIEW GraphicsView)
+ENDIF(SALOME_USE_GRAPHICSVIEW)
+
##
# VTK viewer
##
${SUBDIRS_OBJECT}
${SUBDIRS_VIEWERTOOLS}
${SUBDIRS_GLVIEWER}
+ ${SUBDIRS_GRAPHICSVIEW}
${SUBDIRS_VTKVIEWER}
${SUBDIRS_OCCVIEWER}
${SUBDIRS_PLOT2DVIEWER}
--- /dev/null
+# 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})
--- /dev/null
+# 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})
-#include <ImageComposer_ColorMaskOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_ColorMaskOperator.h"
+#include "ImageComposer_Image.h"
#include <QRectF>
#include <QRgb>
#include <QPixmap>
#ifndef IMAGE_COMPOSER_COLOR_MASK_OPERATOR_HEADER
#define IMAGE_COMPOSER_COLOR_MASK_OPERATOR_HEADER
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
#include <QColor>
/**
-#include <ImageComposer_CropOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_CropOperator.h"
+#include "ImageComposer_Image.h"
#include <QPixmap>
#include <QPainter>
#ifndef IMAGE_COMPOSER_CROP_OPERATOR_HEADER
#define IMAGE_COMPOSER_CROP_OPERATOR_HEADER
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
#include <QColor>
#include <QPainterPath>
-#include <ImageComposer_CutOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_CutOperator.h"
+#include "ImageComposer_Image.h"
#include <QString>
#include <QPixmap>
#include <QPainter>
#ifndef IMAGE_COMPOSER_CUT_OPERATOR_HEADER
#define IMAGE_COMPOSER_CUT_OPERATOR_HEADER
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
#include <QColor>
/**
-#include <ImageComposer_FuseOperator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_FuseOperator.h"
+#include "ImageComposer_Image.h"
#include <QString>
#include <QPixmap>
#include <QPainter>
#ifndef IMAGE_COMPOSER_FUSE_OPERATOR_HEADER
#define IMAGE_COMPOSER_FUSE_OPERATOR_HEADER
-#include <ImageComposer_Operator.h>
+#include "ImageComposer_Operator.h"
#include <QColor>
/**
-#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;
#define IMAGE_COMPOSER_IMAGE_HEADER
#include <QImage>
-#include <ImageComposer.h>
+#include "ImageComposer.h"
class ImageComposer_Operator;
-#include <ImageComposer_Operator.h>
-#include <ImageComposer_Image.h>
+#include "ImageComposer_Operator.h"
+#include "ImageComposer_Image.h"
#include <QPixmap>
#include <QPainter>
#ifndef IMAGE_COMPOSER_OPERATOR_HEADER
#define IMAGE_COMPOSER_OPERATOR_HEADER
-#include <ImageComposer.h>
+#include "ImageComposer.h"
#include <QColor>
class QString;
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})
// 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>
SalomePrs
SPlot2d
GLViewer
+ GraphicsView
OCCViewer
VTKViewer
SalomeObject