diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..2b1725b --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,388 @@ +###################### +# +# Copyright (C) 2014 EngSaS - Engineering Solutions and Services Langenbach. All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +###################### + +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(qgv) + +SET(TARGET_VERSION_MAJOR 0 ) + SET(TARGET_VERSION_MINOR 1 ) + SET(${PROJECT_NAME}_PATCH_LEVEL 0 ) +SET(${PROJECT_NAME}_SOVERSION ${TARGET_VERSION_MAJOR}) +SET(${PROJECT_NAME}_VERSION + "${TARGET_VERSION_MAJOR}.${TARGET_VERSION_MINOR}.${${PROJECT_NAME}_PATCH_LEVEL}" ) + +# INCLUDE(CTest) + +# Extending the Module path with the local module path of desuto +SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) + +OPTION(BUILD_DEBUG "Build in debug mode" ON) +OPTION(BINDINGS_QT4 "Build with Qt4" OFF) +OPTION(BINDINGS_QT5 "Build with Qt5" OFF) +SET(BUILD_DEV ON) + +SET(BUILD_DEBUG_WANTED ${BUILD_DEBUG}) +SET(BUILD_DEV_WANTED ${BUILD_DEV}) +SET(BINDINGS_QT4_WANTED ${BINDINGS_QT4}) +SET(BINDINGS_QT5_WANTED ${BINDINGS_QT5}) + +IF(BUILD_DEBUG) + SET(CMAKE_BUILD_TYPE Debug) +ELSE() + SET(CMAKE_BUILD_TYPE Release) +ENDIF() + +IF(NOT BINDINGS_QT4 AND NOT BINDINGS_QT5) + MESSAGE("Trying to autodetect Qt version") + FIND_PACKAGE(Qt4 QUIET) + IF(Qt4_FOUND OR QT4_FOUND) + SET(BINDINGS_QT4 ON) + MESSAGE("Found Qt4 --> Prefer Qt4 over Qt5") + ELSE(Qt4_FOUND OR QT4_FOUND) + SET(BINDINGS_QT5 ON) + MESSAGE("Qt4 not found --> Try to build with Qt5") + ENDIF(Qt4_FOUND OR QT4_FOUND) +ENDIF(NOT BINDINGS_QT4 AND NOT BINDINGS_QT5) +IF(BINDINGS_QT4) + # Qt4 must be included after setting the build type + FIND_PACKAGE(Qt4 REQUIRED) +ENDIF(BINDINGS_QT4) +IF(BINDINGS_QT5) + IF(BINDINGS_QT4) + MESSAGE("Qt4 and Qt5 enabled --> Preferring Qt4 and therefore disabling Qt5") + SET(BINDINGS_QT5 OFF) + ELSE(BINDINGS_QT4) + FIND_PACKAGE(Qt5Core REQUIRED) + FIND_PACKAGE(Qt5Widgets REQUIRED) + FIND_PACKAGE(Qt5Xml REQUIRED) + FIND_PACKAGE(Qt5XmlPatterns REQUIRED) + FIND_PACKAGE(Qt5Sql REQUIRED) + FIND_PACKAGE(Qt5Network REQUIRED) + FIND_PACKAGE(Qt5LinguistTools REQUIRED) + # Do not automatically link against qtmain + CMAKE_POLICY(SET CMP0020 OLD) + ENDIF(BINDINGS_QT4) +ENDIF(BINDINGS_QT5) +# enable automatic moc by CMAKE +SET(CMAKE_AUTOMOC ON) + +IF(NOT KDE) + IF(NOT APPLE) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") + ENDIF(NOT APPLE) + IF(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_EXCEPTIONS -Zc:wchar_t-") + ELSE(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") + ENDIF(MSVC) + IF(NOT WIN32 AND NOT APPLE) +# SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings -lc -Wl,--disable-auto-import") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings -lc") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi") + ENDIF(NOT WIN32 AND NOT APPLE) +ENDIF(NOT KDE) +IF(BUILD_DEBUG AND NOT MSVC) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") +ENDIF(BUILD_DEBUG AND NOT MSVC) +ADD_DEFINITIONS(${QT_DEFINITIONS}) + +# directory to install binaries +SET(bin_DIR ${CMAKE_INSTALL_PREFIX}/bin) +IF(WIN32) + SET(bin_DIR .) +ENDIF(WIN32) + +IF(NOT WIN32) + SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/" CACHE STRING "Where to install the library files to") +ENDIF(NOT WIN32) +SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) +IF(UNIX) +# SET(designer_DIR "/usr/lib/qt4/plugins/designer") + SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) + SET(include_DIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) + SET(find_cmake_DIR ${CMAKE_ROOT}/Modules/) +ELSE(UNIX) + SET(LIB_INSTALL_DIR ${bin_DIR}) + SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}) + SET(include_DIR ${bin_DIR}/include/${PROJECT_NAME}) + SET(find_cmake_DIR ${CMAKE_ROOT}/Modules/) +ENDIF(UNIX) + +IF(WIN32) + IF(BUILD_DEBUG) + SET(qt_LIBS ${qt_LIBS}/Debug) + ELSE(BUILD_DEBUG) + SET(qt_LIBS ${qt_LIBS}/Release) + ENDIF(BUILD_DEBUG) +ENDIF() + +FIND_PACKAGE(Qt4 REQUIRED) +ADD_DEFINITIONS(${QT_DEFINITIONS}) +FIND_PACKAGE(Graphviz REQUIRED) + +###################### +# +# include source tree +# +###################### +SET(libqgv_SOURCE_DIR ${CMAKE_SOURCE_DIR}/QGVCore) +SET(libqgv_BINARY_DIR ${CMAKE_BINARY_DIR}/QGVCore) +ADD_SUBDIRECTORY(QGVCore) +ADD_SUBDIRECTORY(Sample) + +###################### +# +# printing choosen configuration +# +###################### +MESSAGE("######################################################") +MESSAGE("") +MESSAGE("CONFIGURATION") +MESSAGE("") +MESSAGE("CMAKE_SHARED_LINKER_FLAGS: ${CMAKE_SHARED_LINKER_FLAGS}") +MESSAGE("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") +MESSAGE("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") +MESSAGE("") +MESSAGE("OPTIONS:") +MESSAGE(" Name Wanted Used") +MESSAGE(" BUILD_PACKAGE: ${BUILD_PACKAGE_WANTED} ${BUILD_PACKAGE}") +MESSAGE(" BUILD_DEBUG: ${BUILD_DEBUG_WANTED} ${BUILD_DEBUG}") +MESSAGE(" BUILD_TESTING: ${BUILD_TESTING_WANTED} ${BUILD_TESTING}") +MESSAGE(" BUILD_DEV: ${BUILD_DEV} ${BUILD_DEV}") +MESSAGE(" WITH_DAEMON: ${WITH_DAEMON_WANTED} ${WITH_DAEMON}") +MESSAGE(" WITH_STANDARDS: ${WITH_STANDARDS_WANTED} ${WITH_STANDARDS}") +MESSAGE(" WITH_STRENGTH: ${WITH_STRENGTH_WANTED} ${WITH_STRENGTH}") +MESSAGE(" WITH_MORPHBOX: ${WITH_MORPHBOX_WANTED} ${WITH_MORPHBOX}") +MESSAGE(" WITH_CE_WANTED: ${WITH_CE_WANTED} ${WITH_CE}") +MESSAGE(" WITH_CONSTRUCTIONKIT: ${WITH_CONSTRUCTIONKIT_WANTED} ${WITH_CONSTRUCTIONKIT}") +MESSAGE(" WITH_REGMAN: ${WITH_REGMAN_WANTED} ${WITH_REGMAN}") +MESSAGE(" WITH_FUNCMO: ${WITH_FUNCMO_WANTED} ${WITH_FUNCMO}") +MESSAGE(" WITH_COMP_BINARY: ${WITH_COMP_BINARY_WANTED} ${WITH_COMP_BINARY}") +MESSAGE(" WITH_COMP_WEPO: ${WITH_COMP_WEPO_WANTED} ${WITH_COMP_WEPO}") +MESSAGE(" L10N_ALL: ${L10N_ALL_WANTED} ${L10N_ALL}") +MESSAGE(" L10N_DE: ${L10N_DE_WANTED} ${L10N_DE}") +MESSAGE(" L10N_EN: ${L10N_EN_WANTED} ${L10N_EN}") +MESSAGE(" L10N_FR: ${L10N_FR_WANTED} ${L10N_FR}") +MESSAGE("") +MESSAGE("######################################################") + +###################### +# +# Add uninstall target +# +###################### +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake" + IMMEDIATE @ONLY) +ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake") + + +###################### +# +# CPACK +# +###################### +SET(CPACK_GENERATOR "NSIS") +SET(CPACK_PACKAGE_NAME "QGV") +SET(CPACK_PACKAGE_VENDOR "") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt interface for Graphviz") +SET(CPACK_PACKAGE_VERSION ${${PROJECT_NAME}_VERSION}) +SET(CPACK_PACKAGE_VERSION_MAJOR ${TARGET_MAJOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_MINOR ${TARGET_MINOR_VERSION}) +SET(CPACK_PACKAGE_VERSION_PATCH ${${PROJECT_NAME}_PATCH_LEVEL}) +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "qgv") + +# add all components which should be installable via the package +IF(WIN32) + SET(external_DLL + qtlibs + ) +ENDIF(WIN32) + +SET(CPACK_COMPONENTS_ALL + library + ${external_DLL} + sample +) + +# License file +SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) + +# Pre selected installation profiles +SET(CPACK_ALL_INSTALL_TYPES Full Client Daemon) + +# groups for components +SET(CPACK_COMPONENT_GROUP_BASE_DISPLAY_NAME "Base") +SET(CPACK_COMPONENT_GROUP_BASE_DESCRIPTION "The base components needed by most installation scenarios") +IF(WITH_DAEMON) + SET(CPACK_COMPONENT_GROUP_DAEMON_DISPLAY_NAME "Daemon") + SET(CPACK_COMPONENT_GROUP_DAEMON_DESCRIPTION "This components provide stuff which needs background running") +ENDIF(WITH_DAEMON) +SET(CPACK_COMPONENT_GROUP_MODULES_DISPLAY_NAME "Modules") +SET(CPACK_COMPONENT_GROUP_MODULES_DESCRIPTION "The modules which can be used with DeSuTo") +SET(CPACK_COMPONENT_GROUP_3RDPARTYLIBS_DISPLAY_NAME "3rd Party Libraries") +SET(CPACK_COMPONENT_GROUP_3RDPARTYLIBS_DESCRIPTION "3rd Party libraries which are needed to run DeSuTo and or modules. They are only needed if they are not already exist in PATH") + + +# the scheme of the variable names are: CPACK_COMPNONENT_%COMPONENTNAMEINUPPERCASE%_DISPLAY_NAME +# where %COMPONENTNAMEINUPPERCASE% must be replaced by the upper cased name of the component +# see below for example +SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "LibDeSuTo") +SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION + "The library of the DeSuTo project provides components which are used by every module and the applications") +SET(CPACK_COMPONENT_LIBRARY_GROUP "Base") +SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Full Client Daemon) + +SET(CPACK_COMPONENT_QTLIBS_DISPLAY_NAME "QT") +SET(CPACK_COMPONENT_QTLIBS_DESCRIPTION + "Libraries which are needed, but not belonging to this project. They must not be installed, if they are already installed at path") +SET(CPACK_COMPONENT_QTLIBS_GROUP "3rdPartyLibs") +SET(CPACK_COMPONENT_QTLIBS_INSTALL_TYPES Full Client Daemon) + +SET(CPACK_COMPONENT_MYSQLLIBS_DISPLAY_NAME "Mysql-QT-Plugin") +SET(CPACK_COMPONENT_MYSQLLIBS_DESCRIPTION + "Libraries which are needed, but not belonging to this project. This libs are needed, if you want to connect to a MySQL-Server") +SET(CPACK_COMPONENT_MYSQLLIBS_GROUP "3rdPartyLibs") +SET(CPACK_COMPONENT_MYSQLLIBS_INSTALL_TYPES Full Client Daemon) + +SET(CPACK_COMPONENT_APPLICATION_DISPLAY_NAME "DeSuTo Application") +SET(CPACK_COMPONENT_APPLICATION_DESCRIPTION + "The main application of the DeSuTo application. It provides a GUI-frame for all modules") +SET(CPACK_COMPONENT_APPLICATION_GROUP "Base") +SET(CPACK_COMPONENT_APPLICATION_DEPENDS library) +SET(CPACK_COMPONENT_APPLICATION_INSTALL_TYPES Full Client) + +IF(WITH_DAEMON) + SET(CPACK_COMPONENT_SYSTRAY_DISPLAY_NAME "DeSuToDaeomen") + SET(CPACK_COMPONENT_SYSTRAY_DESCRIPTION + "System tray tool to run some tasks at the background") + SET(CPACK_COMPONENT_SYSTRAY_GROUP "Daemon") + SET(CPACK_COMPONENT_SYSTRAY_DEPENDS library) + SET(CPACK_COMPONENT_SYSTRAY_INSTALL_TYPES Full Daemon) +ENDIF(WITH_DAEMON) + +IF(WITH_CE) + SET(CPACK_COMPONENT_MODULECE_DISPLAY_NAME "DeSuToCE") + SET(CPACK_COMPONENT_MODULECE_DESCRIPTION + "Module to help with CE-Marking") + SET(CPACK_COMPONENT_MODULECE_GROUP "Modules") + SET(CPACK_COMPONENT_MODULECE_DEPENDS library) + SET(CPACK_COMPONENT_MODULECE_INSTALL_TYPES Full Client Daemon) +ENDIF(WITH_CE) + +IF(WITH_CONSTRUCTIONKIT) + SET(CPACK_COMPONENT_MODULECONSTRUCTIONKIT_DISPLAY_NAME "DeSuToConstructionKit") + SET(CPACK_COMPONENT_MODULECONSTRUCTIONKIT_DESCRIPTION + "Module to create construction kits") + SET(CPACK_COMPONENT_MODULECONSTRUCTIONKIT_GROUP "Modules") + SET(CPACK_COMPONENT_MODULECONSTRUCTIONKIT_DEPENDS library) + SET(CPACK_COMPONENT_MODULECONSTRUCTIONKIT_INSTALL_TYPES Full Client) +ENDIF(WITH_CONSTRUCTIONKIT) + +IF(WITH_STANDARDS) + SET(CPACK_COMPONENT_MODULESTANDARDS_DISPLAY_NAME "Standards Management") + SET(CPACK_COMPONENT_MODULESTANDARDS_DESCRIPTION + "Manage standards like DIN, DIN EN, DIN ISO, ISO, ...") + SET(CPACK_COMPONENT_MODULESTANDARDS_GROUP "Modules") + SET(CPACK_COMPONENT_MODULESTANDARDS_DEPENDS library) + SET(CPACK_COMPONENT_MODULESTANDARDS_INSTALL_TYPES Full Client Daemon) +ENDIF(WITH_STANDARDS) + +IF(WITH_REGMAN) + SET(CPACK_COMPONENT_MODULEREGMAN_DISPLAY_NAME "Registry Manager") + SET(CPACK_COMPONENT_MODULEREGMAN_DESCRIPTION + "Support's the engineer developing registers.") + SET(CPACK_COMPONENT_MODULEREGMAN_GROUP "Modules") + SET(CPACK_COMPONENT_MODULEREGMAN_DEPENDS library) + SET(CPACK_COMPONENT_MODULEREGMAN_INSTALL_TYPES Full Client) +ENDIF(WITH_REGMAN) + +IF(WITH_INTERNAL_PDF_VIEWER) + SET(CPACK_COMPONENT_POPPLER_DISPLAY_NAME "Poppler") + SET(CPACK_COMPONENT_POPPLER_DESCRIPTION + "Libraries which are needed, but not belonging to this project. The must not be installed, if they are already installed at path") + SET(CPACK_COMPONENT_POPPLER_GROUP "3rdPartyLibs") + SET(CPACK_COMPONENT_POPPLER_INSTALL_TYPES Full Client Daemon) +ENDIF(WITH_INTERNAL_PDF_VIEWER) + +IF(WITH_STRENGTH) + SET(CPACK_COMPONENT_MODULESTRENGTH_DISPLAY_NAME "DeSuToStrength") + SET(CPACK_COMPONENT_MODULESTRENGTH_DESCRIPTION + "Allows to calculate some machine elements") + SET(CPACK_COMPONENT_MODULESTRENGTH_GROUP "Modules") + SET(CPACK_COMPONENT_MODULESTRENGTH_DEPENDS library) + SET(CPACK_COMPONENT_MODULESTRENGTH_INSTALL_TYPES Full Client) +ENDIF(WITH_STRENGTH) + +IF(WITH_MORPHBOX) + SET(CPACK_COMPONENT_MODULEMORPHBOX_DISPLAY_NAME "Morphological Boxes") + SET(CPACK_COMPONENT_MODULEMORPHBOX_DESCRIPTION + "Supports the use of morphological boxes to find many good variants.") + SET(CPACK_COMPONENT_MODULEMORPHBOX_GROUP "Modules") + SET(CPACK_COMPONENT_MODULEMORPHBOX_DEPENDS library) + SET(CPACK_COMPONENT_MODULEMORPHBOX_INSTALL_TYPES Full Client) +ENDIF(WITH_MORPHBOX) + +IF(WITH_FUNCMO) + SET(CPACK_COMPONENT_MODULEFUNCMO_DISPLAY_NAME "Function Modeler") + SET(CPACK_COMPONENT_MODULEFUNCMO_DESCRIPTION + "Allows to model the function structure of your development object.") + SET(CPACK_COMPONENT_MODULEFUNCMO_GROUP "Modules") + SET(CPACK_COMPONENT_MODULEFUNCMO_DEPENDS library) + SET(CPACK_COMPONENT_MODULEFUNCMO_INSTALL_TYPES Full Client) +ENDIF(WITH_FUNCMO) + +IF(WITH_COMP_BINARY) + SET(CPACK_COMPONENT_MODULECOMPBINARY_DISPLAY_NAME "Binary Comparison") + SET(CPACK_COMPONENT_MODULECOMPBINARY_DESCRIPTION + "Compare several alterantives (called options in DeSuTo) easily and fast with binary values.") + SET(CPACK_COMPONENT_MODULECOMPBINARY_GROUP "Modules") + SET(CPACK_COMPONENT_MODULECOMPBINARY_DEPENDS library) + SET(CPACK_COMPONENT_MODULECOMPBINARY_INSTALL_TYPES Full Client) +ENDIF(WITH_COMP_BINARY) + +IF(WITH_COMP_WEPO) + SET(CPACK_COMPONENT_MODULECOMPWEPO_DISPLAY_NAME "Weighted Points Comparisons") + SET(CPACK_COMPONENT_MODULECOMPWEPO_DESCRIPTION + "Compare several alterantives (called options in DeSuTo) detailed with weighted points.") + SET(CPACK_COMPONENT_MODULECOMPWEPO_GROUP "Modules") + SET(CPACK_COMPONENT_MODULECOMPWEPO_DEPENDS library) + SET(CPACK_COMPONENT_MODULECOMPWEPO_INSTALL_TYPES Full Client) +ENDIF(WITH_COMP_WEPO) + +# used by NSIS to create startmenu links to the executables +# this entrys are only useful if a bin folder is used, otherwise use the empty EXECUTABLES +# and fill out the NSIS_MENU_LINKS +#SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "desuto" "DeSuTo") +#SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "desutodaemon" "DeSuToDaemon") +SET(CPACK_PACKAGE_EXECUTABLES "" "") + +SET(CPACK_NSIS_MENU_LINKS "epartexe.exe \\\"desuto\\\"" "DeSuTo") +IF(WITH_DAEMON) + SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "desutodaemon.exe" "DeSuToDaemon") +ENDIF(WITH_DAEMON) +# IF(WITH_REGMAN) + # SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "epartexe.exe libregman.so" "RegMan") +# ENDIF(WITH_REGMAN) + +# This must always be last! +INCLUDE(CPack) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..4362b49 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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, or (at your option) any later version. + + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/QGVCore/CMakeLists.txt b/QGVCore/CMakeLists.txt new file mode 100644 index 0000000..3dbee21 --- /dev/null +++ b/QGVCore/CMakeLists.txt @@ -0,0 +1,143 @@ +# enable all QT-Stuff we need +# see http://cmake.org/cmake/help/cmake2.6docs.html#module:FindQt4 for a complete list + +SET(qgvlib_TS +) + +SET(qgvlib_UI + +) + +# all files which may be mocced +SET(qgvlib_CPP + private/QGVCore.cpp + private/QGVGraphPrivate.cpp + private/QGVEdgePrivate.cpp + private/QGVGvcPrivate.cpp + private/QGVNodePrivate.cpp + QGVEdge.cpp + QGVNode.cpp + QGVScene.cpp + QGVSubGraph.cpp +) + +# include with QT_USE selected library parts +INCLUDE(${QT_USE_FILE}) + +INCLUDE_DIRECTORIES( + ${GRAPHVIZ_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/private + ${CMAKE_CURRENT_BINARY_DIR}/private + +) +# Activate Export macro for building the library itself +# if QGVCORE_LIB is not set or equal 0 (null), import macro is used +ADD_DEFINITIONS(-DQGVCORE_LIB) + +IF(BINDINGS_QT4) + # QT5 does not declare and does not need QT_INCLUDES + SET(INCLUDE_DIRECTORIES ${INCLUDES_DIRECTORIES} ${QT_INCLUDES}) + INCLUDE(${QT_USE_FILE}) +ENDIF(BINDINGS_QT4) +ADD_DEFINITIONS(-DQVGCORE_LIB) + +IF(BINDINGS_QT4) + QT4_AUTOMOC(${qgvlib_CPP}) + QT4_WRAP_UI(qgvlib_UI_H ${qgvlib_UI}) + QT4_ADD_TRANSLATION(qgvlib_TRANS ${qgvlib_TS}) + # -binary is not working + # QT4_ADD_RESOURCES(RCCS "${QRCS}" OPTIONS "-binary") + # QT4_ADD_RESOURCES(qgvlib_RCCS ${qgvlib_QRC}) +ENDIF(BINDINGS_QT4) +IF(BINDINGS_QT5) + QT5_WRAP_UI(qgvlib_UI_H ${qgvlib_UI}) + QT5_ADD_TRANSLATION(qgvlib_TRANS ${qgvlib_TS}) + QT5_ADD_RESOURCES(qgvlib_RCCS ${qgvlib_QRC}) +ENDIF(BINDINGS_QT5) + +ADD_LIBRARY(qgvcore SHARED + ${qgvlib_CPP} + ${qgvlib_UI_H} + ${qgvlib_TRANS} +) + +TARGET_LINK_LIBRARIES(qgvcore + ${QT_LIBRARIES} + ${GRAPHVIZ_GVC_LIBRARY} + ${GRAPHVIZ_CGRAPH_LIBRARY} + ${GRAPHVIZ_CDT_LIBRARY} +) + +IF(BINDINGS_QT5) + qt5_use_modules(QVGCore Core Widgets) +ENDIF(BINDINGS_QT5) + +SET_TARGET_PROPERTIES(qgvcore PROPERTIES + OUTPUT_NAME "QGVCore" + VERSION ${TARGET_VERSION_MAJOR}.${TARGET_VERSION_MINOR}.${${PROJECT_NAME}_PATCH_LEVEL} + SOVERSION ${TARGET_VERSION_MAJOR}) +IF(WIN32) + # this extra install command is needed by the nsis installer + INSTALL(TARGETS qgvcore + RUNTIME DESTINATION ${LIB_INSTALL_DIR} + COMPONENT library + ) +ELSE(WIN32) + INSTALL(TARGETS qgvcore + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + COMPONENT library + ) +ENDIF(WIN32) + +# The COMPONENT option only defines the internal belonging of the INSTALL'ed thing +# INSTALL( + # FILES ${qgvlib_TRANS} + # DESTINATION ${qm_DIR} + # COMPONENT library +# ) + +IF(WIN32) + # QuaZip + # FIND_FILE(PACK_zlib zlib.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # INSTALL(FILES ${QUAZIP_LIBRARIES} ${PACK_zlib} DESTINATION ${bin_DIR} COMPONENT library) + + # Qt itself + # FIND_FILE(PACK_qtcore QtCore4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # FIND_FILE(PACK_qtgui QtGui4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # FIND_FILE(PACK_qtnetwork QtNetwork4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # FIND_FILE(PACK_qtsql QtSql4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # FIND_FILE(PACK_qtxml QtXml4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # FIND_FILE(PACK_qtxml_patterns QtXmlPatterns4.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + + # FIND_FILE(PACK_mingwm10 mingwm10.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + # FIND_FILE(PACK_libgcc_s_dw libgcc_s_dw2-1.dll PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) + + # INSTALL( + # FILES + # ${PACK_qtcore} + # ${PACK_qtgui} + # ${PACK_qtnetwork} + # ${PACK_qtsql} + # ${PACK_libmysql} + # ${PACK_qtxml} + # ${PACK_qtxml_patterns} + # ${PACK_mingwm10} + # ${PACK_libgcc_s_dw} + # ${LIBENGSAS_LIBRARIES} + # ${LIBENGSAS_EPARTEXE} + # DESTINATION ${bin_DIR} + # COMPONENT qtlibs + # ) +ENDIF(WIN32) + +IF(BUILD_DEV) + FILE(GLOB header "${CMAKE_CURRENT_SOURCE_DIR}/*.h") + INSTALL( + FILES ${header} + DESTINATION ${include_DIR} + COMPONENT headerfiles + ) +ENDIF(BUILD_DEV) diff --git a/QGVCore/GraphViz.pri b/QGVCore/GraphViz.pri index 42749e2..a9bf6db 100644 --- a/QGVCore/GraphViz.pri +++ b/QGVCore/GraphViz.pri @@ -1,5 +1,7 @@ #GraphViz librairie DEFINES += WITH_CGRAPH +INCLUDEPATH += private +QMAKE_CXXFLAGS += -DQGVCORE_LIB -DQMAKE_MOC unix { CONFIG += link_pkgconfig @@ -7,9 +9,9 @@ unix { } win32 { #Configure Windows GraphViz path here : - GRAPHVIZ_PATH = "C:/Program Files (x86)/Graphviz2.36" + GRAPHVIZ_PATH = "D:/Program Files (x86)/Graphviz2.36/" DEFINES += WIN32_DLL DEFINES += GVDLL INCLUDEPATH += $$GRAPHVIZ_PATH/include/graphviz LIBS += -L$$GRAPHVIZ_PATH/lib/release/lib -lgvc -lcgraph -lgraph -lcdt -} \ No newline at end of file +} diff --git a/QGVCore/QGVCore.pro b/QGVCore/QGVCore.pro index a7771f0..68a9d6e 100644 --- a/QGVCore/QGVCore.pro +++ b/QGVCore/QGVCore.pro @@ -6,13 +6,6 @@ QT += core -greaterThan(QT_MAJOR_VERSION, 4){ - QT += widgets -} -lessThan(QT_MAJOR_VERSION, 5) { - QT += gui -} - TARGET = QGVCore TEMPLATE = lib CONFIG += shared @@ -29,10 +22,19 @@ SOURCES += QGVScene.cpp \ QGVNode.cpp \ QGVEdge.cpp \ QGVSubGraph.cpp \ - QGVCore.cpp + private/QGVCore.cpp \ + private/QGVGraphPrivate.cpp \ + private/QGVGvcPrivate.cpp \ + private/QGVEdgePrivate.cpp \ + private/QGVNodePrivate.cpp HEADERS += QGVScene.h \ QGVNode.h \ QGVEdge.h \ QGVSubGraph.h \ - QGVCore.h + private/QGVCore.h \ + private/QGVGraphPrivate.h \ + private/QGVGvcPrivate.h \ + private/QGVEdgePrivate.h \ + private/QGVNodePrivate.h \ + qgv.h diff --git a/QGVCore/QGVEdge.cpp b/QGVCore/QGVEdge.cpp index 4587b22..5b92aea 100644 --- a/QGVCore/QGVEdge.cpp +++ b/QGVCore/QGVEdge.cpp @@ -16,11 +16,14 @@ You should have received a copy of the GNU Lesser General Public License along with this library. ***************************************************************/ #include +#include #include +#include +#include #include #include -QGVEdge::QGVEdge(Agedge_t *edge, QGVScene *scene) : _edge(edge), _scene(scene) +QGVEdge::QGVEdge(QGVEdgePrivate *edge, QGVScene *scene) : _edge(edge), _scene(scene) { setFlag(QGraphicsItem::ItemIsSelectable, true); } @@ -28,6 +31,7 @@ QGVEdge::QGVEdge(Agedge_t *edge, QGVScene *scene) : _edge(edge), _scene(scene) QGVEdge::~QGVEdge() { _scene->removeItem(this); + delete _edge; } QString QGVEdge::label() const @@ -94,12 +98,12 @@ void QGVEdge::paint(QPainter * painter, const QStyleOptionGraphicsItem * option, void QGVEdge::setAttribute(const QString &name, const QString &value) { - agsafeset(_edge, name.toLocal8Bit().data(), value.toLocal8Bit().data(), ""); + agsafeset(_edge->edge(), name.toLocal8Bit().data(), value.toLocal8Bit().data(), ""); } QString QGVEdge::getAttribute(const QString &name) const { - char* value = agget(_edge, name.toLocal8Bit().data()); + char* value = agget(_edge->edge(), name.toLocal8Bit().data()); if(value) return value; return QString(); @@ -109,9 +113,9 @@ void QGVEdge::updateLayout() { prepareGeometryChange(); - qreal gheight = QGVCore::graphHeight(_scene->_graph); + qreal gheight = QGVCore::graphHeight(_scene->_graph->graph()); - const splines* spl = ED_spl(_edge); + const splines* spl = ED_spl(_edge->edge()); _path = QGVCore::toPath(spl, gheight); @@ -134,12 +138,12 @@ void QGVEdge::updateLayout() _pen.setStyle(QGVCore::toPenStyle(getAttribute("style"))); //Edge label - textlabel_t *xlabel = ED_xlabel(_edge); + textlabel_t *xlabel = ED_xlabel(_edge->edge()); if(xlabel) { _label = xlabel->text; _label_rect.setSize(QSize(xlabel->dimen.x, xlabel->dimen.y)); - _label_rect.moveCenter(QGVCore::toPoint(xlabel->pos, QGVCore::graphHeight(_scene->_graph))); + _label_rect.moveCenter(QGVCore::toPoint(xlabel->pos, QGVCore::graphHeight(_scene->_graph->graph()))); } setToolTip(getAttribute("tooltip")); diff --git a/QGVCore/QGVEdge.h b/QGVCore/QGVEdge.h index 439840f..67112d8 100644 --- a/QGVCore/QGVEdge.h +++ b/QGVCore/QGVEdge.h @@ -18,18 +18,19 @@ License along with this library. #ifndef QGVEDGE_H #define QGVEDGE_H -#include +#include #include #include class QGVNode; class QGVScene; +class QGVEdgePrivate; /** * @brief Edge item * */ -class QGVEdge : public QGraphicsItem +class QGVCORE_EXPORT QGVEdge : public QGraphicsItem { public: ~QGVEdge(); @@ -54,7 +55,7 @@ class QGVEdge : public QGraphicsItem } private: - QGVEdge(Agedge_t *edge, QGVScene *scene); + QGVEdge(QGVEdgePrivate *edge, QGVScene *scene); QPolygonF toArrow(const QLineF &normal) const; @@ -62,7 +63,7 @@ class QGVEdge : public QGraphicsItem //friend class QGVSubGraph; QGVScene *_scene; - Agedge_t* _edge; + QGVEdgePrivate* _edge; QPainterPath _path; QPen _pen; diff --git a/QGVCore/QGVNode.cpp b/QGVCore/QGVNode.cpp index 13d261f..da39d6e 100644 --- a/QGVCore/QGVNode.cpp +++ b/QGVCore/QGVNode.cpp @@ -16,11 +16,14 @@ You should have received a copy of the GNU Lesser General Public License along with this library. ***************************************************************/ #include +#include #include +#include +#include #include #include -QGVNode::QGVNode(Agnode_t* node, QGVScene *scene): _node(node), _scene(scene) +QGVNode::QGVNode(QGVNodePrivate *node, QGVScene *scene): _node(node), _scene(scene) { setFlag(QGraphicsItem::ItemIsSelectable, true); } @@ -28,6 +31,7 @@ QGVNode::QGVNode(Agnode_t* node, QGVScene *scene): _node(node), _scene(scene) QGVNode::~QGVNode() { _scene->removeItem(this); + delete _node; } QString QGVNode::label() const @@ -82,12 +86,12 @@ void QGVNode::paint(QPainter * painter, const QStyleOptionGraphicsItem * option, void QGVNode::setAttribute(const QString &name, const QString &value) { - agsafeset(_node, name.toLocal8Bit().data(), value.toLocal8Bit().data(), ""); + agsafeset(_node->node(), name.toLocal8Bit().data(), value.toLocal8Bit().data(), ""); } QString QGVNode::getAttribute(const QString &name) const { - char* value = agget(_node, name.toLocal8Bit().data()); + char* value = agget(_node->node(), name.toLocal8Bit().data()); if(value) return value; return QString(); @@ -101,18 +105,18 @@ void QGVNode::setIcon(const QImage &icon) void QGVNode::updateLayout() { prepareGeometryChange(); - qreal width = ND_width(_node)*DotDefaultDPI; - qreal height = ND_height(_node)*DotDefaultDPI; + qreal width = ND_width(_node->node())*DotDefaultDPI; + qreal height = ND_height(_node->node())*DotDefaultDPI; //Node Position (center) - qreal gheight = QGVCore::graphHeight(_scene->_graph); - setPos(QGVCore::centerToOrigin(QGVCore::toPoint(ND_coord(_node), gheight), width, height)); + qreal gheight = QGVCore::graphHeight(_scene->_graph->graph()); + setPos(QGVCore::centerToOrigin(QGVCore::toPoint(ND_coord(_node->node()), gheight), width, height)); //Node on top setZValue(1); //Node path - _path = QGVCore::toPath(ND_shape(_node)->name, (polygon_t*)ND_shape_info(_node), width, height); + _path = QGVCore::toPath(ND_shape(_node->node())->name, (polygon_t*)ND_shape_info(_node->node()), width, height); _pen.setWidth(1); _brush.setStyle(QGVCore::toBrushStyle(getAttribute("style"))); diff --git a/QGVCore/QGVNode.h b/QGVCore/QGVNode.h index 13ae193..60a8ee5 100644 --- a/QGVCore/QGVNode.h +++ b/QGVCore/QGVNode.h @@ -18,18 +18,19 @@ License along with this library. #ifndef QGVNODE_H #define QGVNODE_H -#include +#include #include #include class QGVEdge; class QGVScene; +class QGVNodePrivate; /** * @brief Node item * */ -class QGVNode : public QGraphicsItem +class QGVCORE_EXPORT QGVNode : public QGraphicsItem { public: ~QGVNode(); @@ -54,10 +55,11 @@ class QGVNode : public QGraphicsItem friend class QGVScene; friend class QGVSubGraph; void updateLayout(); - QGVNode(Agnode_t* node, QGVScene *scene); + QGVNode(QGVNodePrivate* node, QGVScene *scene); - QPainterPath makeShape(Agnode_t* node) const; - QPolygonF makeShapeHelper(Agnode_t* node) const; + // Not implemented in QGVNode.cpp +// QPainterPath makeShape(Agnode_t* node) const; +// QPolygonF makeShapeHelper(Agnode_t* node) const; QPainterPath _path; QPen _pen; @@ -65,7 +67,7 @@ class QGVNode : public QGraphicsItem QImage _icon; QGVScene *_scene; - Agnode_t* _node; + QGVNodePrivate* _node; }; diff --git a/QGVCore/QGVScene.cpp b/QGVCore/QGVScene.cpp index 0fd1d7e..00b96d3 100644 --- a/QGVCore/QGVScene.cpp +++ b/QGVCore/QGVScene.cpp @@ -16,46 +16,62 @@ You should have received a copy of the GNU Lesser General Public License along with this library. ***************************************************************/ #include "QGVScene.h" +// The following include allows the automoc to detect, that it must moc this class +#ifndef QMAKE_MOC + #include "moc_QGVScene.cpp" +#endif #include +#include +#include +#include + +#include +#include +#include +#include +#include + QGVScene::QGVScene(const QString &name, QObject *parent) : QGraphicsScene(parent) { - _context = gvContext(); - _graph = agopen(name.toLocal8Bit().data(), Agdirected, NULL); + _context = new QGVGvcPrivate(gvContext()); + _graph = new QGVGraphPrivate(agopen(name.toLocal8Bit().data(), Agdirected, NULL)); //setGraphAttribute("fontname", QFont().family()); } QGVScene::~QGVScene() { - gvFreeLayout(_context, _graph); - agclose(_graph); - gvFreeContext(_context); + gvFreeLayout(_context->context(), _graph->graph()); + agclose(_graph->graph()); + gvFreeContext(_context->context()); + delete _graph; + delete _context; } void QGVScene::setGraphAttribute(const QString &name, const QString &value) { - agattr(_graph, AGRAPH, name.toLocal8Bit().data(), value.toLocal8Bit().data()); + agattr(_graph->graph(), AGRAPH, name.toLocal8Bit().data(), value.toLocal8Bit().data()); } void QGVScene::setNodeAttribute(const QString &name, const QString &value) { - agattr(_graph, AGNODE, name.toLocal8Bit().data(), value.toLocal8Bit().data()); + agattr(_graph->graph(), AGNODE, name.toLocal8Bit().data(), value.toLocal8Bit().data()); } void QGVScene::setEdgeAttribute(const QString &name, const QString &value) { - agattr(_graph, AGEDGE, name.toLocal8Bit().data(), value.toLocal8Bit().data()); + agattr(_graph->graph(), AGEDGE, name.toLocal8Bit().data(), value.toLocal8Bit().data()); } QGVNode *QGVScene::addNode(const QString &label) { - Agnode_t *node = agnode(_graph, NULL, TRUE); + Agnode_t *node = agnode(_graph->graph(), NULL, TRUE); if(node == NULL) { qWarning()<<"Invalid node :"<setLabel(label); addItem(item); _nodes.append(item); @@ -64,14 +80,14 @@ QGVNode *QGVScene::addNode(const QString &label) QGVEdge *QGVScene::addEdge(QGVNode *source, QGVNode *target, const QString &label) { - Agedge_t* edge = agedge(_graph, source->_node, target->_node, NULL, TRUE); + Agedge_t* edge = agedge(_graph->graph(), source->_node->node(), target->_node->node(), NULL, TRUE); if(edge == NULL) { qWarning()<<"Invalid egde :"<setLabel(label); addItem(item); _edges.append(item); @@ -82,9 +98,9 @@ QGVSubGraph *QGVScene::addSubGraph(const QString &name, bool cluster) { Agraph_t* sgraph; if(cluster) - sgraph = agsubg(_graph, ("cluster_" + name).toLocal8Bit().data(), TRUE); + sgraph = agsubg(_graph->graph(), ("cluster_" + name).toLocal8Bit().data(), TRUE); else - sgraph = agsubg(_graph, name.toLocal8Bit().data(), TRUE); + sgraph = agsubg(_graph->graph(), name.toLocal8Bit().data(), TRUE); if(sgraph == NULL) { @@ -92,7 +108,7 @@ QGVSubGraph *QGVScene::addSubGraph(const QString &name, bool cluster) return 0; } - QGVSubGraph *item = new QGVSubGraph(sgraph, this); + QGVSubGraph *item = new QGVSubGraph(new QGVGraphPrivate(sgraph), this); addItem(item); _subGraphs.append(item); return item; @@ -101,83 +117,31 @@ QGVSubGraph *QGVScene::addSubGraph(const QString &name, bool cluster) void QGVScene::setRootNode(QGVNode *node) { Q_ASSERT(_nodes.contains(node)); - agset(_graph, "root", node->label().toLocal8Bit().data()); -} - -//Hack ... - -typedef struct { - const char *data; - int len; - int cur; -} rdr_t; - -static int memiofread(void *chan, char *buf, int bufsize) -{ - const char *ptr; - char *optr; - char c; - int l; - rdr_t *s; - - if (bufsize == 0) return 0; - s = (rdr_t *) chan; - if (s->cur >= s->len) - return 0; - l = 0; - ptr = s->data + s->cur; - optr = buf; - do { - *optr++ = c = *ptr++; - l++; - } while (c && (c != '\n') && (l < bufsize)); - s->cur += l; - return l; -} - -Agraph_t *agmemread2(const char *cp) -{ - Agraph_t* g; - rdr_t rdr; - Agdisc_t disc; - Agiodisc_t memIoDisc; - - memIoDisc.afread = memiofread; - memIoDisc.putstr = AgIoDisc.putstr; - memIoDisc.flush = AgIoDisc.flush; - rdr.data = cp; - rdr.len = strlen(cp); - rdr.cur = 0; - - disc.mem = &AgMemDisc; - disc.id = &AgIdDisc; - disc.io = &memIoDisc; - g = agread (&rdr, &disc); - return g; + agset(_graph->graph(), "root", node->label().toLocal8Bit().data()); } void QGVScene::loadLayout(const QString &text) { - _graph = agmemread2(text.toLocal8Bit().constData()); + _graph->setGraph(QGVCore::agmemread2(text.toLocal8Bit().constData())); - if(gvLayout(_context, _graph, "dot") != 0) + if(gvLayout(_context->context(), _graph->graph(), "dot") != 0) { qCritical()<<"Layout render error"<context(), _graph->graph(), "png", "debug.png"); //Read nodes and edges - for (Agnode_t* node = agfstnode(_graph); node != NULL; node = agnxtnode(_graph, node)) + for (Agnode_t* node = agfstnode(_graph->graph()); node != NULL; node = agnxtnode(_graph->graph(), node)) { - QGVNode *inode = new QGVNode(node, this); + QGVNode *inode = new QGVNode(new QGVNodePrivate(node), this); inode->updateLayout(); addItem(inode); - for (Agedge_t* edge = agfstout(_graph, node); edge != NULL; edge = agnxtout(_graph, edge)) + for (Agedge_t* edge = agfstout(_graph->graph(), node); edge != NULL; edge = agnxtout(_graph->graph(), edge)) { - QGVEdge *iedge = new QGVEdge(edge, this); + QGVEdge *iedge = new QGVEdge(new QGVEdgePrivate(edge), this); iedge->updateLayout(); addItem(iedge); } @@ -188,7 +152,7 @@ void QGVScene::loadLayout(const QString &text) void QGVScene::applyLayout() { - if(gvLayout(_context, _graph, "dot") != 0) + if(gvLayout(_context->context(), _graph->graph(), "dot") != 0) { /* * Si plantage ici : @@ -200,8 +164,8 @@ void QGVScene::applyLayout() } //Debug output - //gvRenderFilename(_context, _graph, "canon", "debug.dot"); - //gvRenderFilename(_context, _graph, "png", "debug.png"); + //gvRenderFilename(_context->context(), _graph->graph(), "canon", "debug.dot"); + //gvRenderFilename(_context->context(), _graph->graph(), "png", "debug.png"); //Update items layout foreach(QGVNode* node, _nodes) @@ -214,11 +178,11 @@ void QGVScene::applyLayout() sgraph->updateLayout(); //Graph label - textlabel_t *xlabel = GD_label(_graph); + textlabel_t *xlabel = GD_label(_graph->graph()); if(xlabel) { QGraphicsTextItem *item = addText(xlabel->text); - item->setPos(QGVCore::centerToOrigin(QGVCore::toPoint(xlabel->pos, QGVCore::graphHeight(_graph)), xlabel->dimen.x, -4)); + item->setPos(QGVCore::centerToOrigin(QGVCore::toPoint(xlabel->pos, QGVCore::graphHeight(_graph->graph())), xlabel->dimen.x, -4)); } update(); @@ -226,7 +190,7 @@ void QGVScene::applyLayout() void QGVScene::clear() { - gvFreeLayout(_context, _graph); + gvFreeLayout(_context->context(), _graph->graph()); _nodes.clear(); _edges.clear(); _subGraphs.clear(); @@ -236,7 +200,7 @@ void QGVScene::clear() #include void QGVScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent) { - QGraphicsItem *item = itemAt(contextMenuEvent->scenePos(), QTransform()); + QGraphicsItem *item = itemAt(contextMenuEvent->scenePos()); if(item) { item->setSelected(true); @@ -254,7 +218,7 @@ void QGVScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent void QGVScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *mouseEvent) { - QGraphicsItem *item = itemAt(mouseEvent->scenePos(), QTransform()); + QGraphicsItem *item = itemAt(mouseEvent->scenePos()); if(item) { if(item->type() == QGVNode::Type) diff --git a/QGVCore/QGVScene.h b/QGVCore/QGVScene.h index a69710e..da060e4 100644 --- a/QGVCore/QGVScene.h +++ b/QGVCore/QGVScene.h @@ -18,18 +18,21 @@ License along with this library. #ifndef QGVSCENE_H #define QGVSCENE_H -#include +#include #include -#include -#include -#include +class QGVNode; +class QGVEdge; +class QGVSubGraph; + +class QGVGraphPrivate; +class QGVGvcPrivate; /** * @brief GraphViz interactive scene * */ -class QGVScene : public QGraphicsScene +class QGVCORE_EXPORT QGVScene : public QGraphicsScene { Q_OBJECT public: @@ -75,8 +78,8 @@ public slots: friend class QGVEdge; friend class QGVSubGraph; - GVC_t *_context; - Agraph_t *_graph; + QGVGvcPrivate *_context; + QGVGraphPrivate *_graph; //QFont _font; QList _nodes; diff --git a/QGVCore/QGVSubGraph.cpp b/QGVCore/QGVSubGraph.cpp index 00b0ced..4566ac6 100644 --- a/QGVCore/QGVSubGraph.cpp +++ b/QGVCore/QGVSubGraph.cpp @@ -16,11 +16,15 @@ You should have received a copy of the GNU Lesser General Public License along with this library. ***************************************************************/ #include "QGVSubGraph.h" +#include #include +#include +#include +#include #include #include -QGVSubGraph::QGVSubGraph(Agraph_t* subGraph, QGVScene *scene): _sgraph(subGraph), _scene(scene) +QGVSubGraph::QGVSubGraph(QGVGraphPrivate *subGraph, QGVScene *scene): _sgraph(subGraph), _scene(scene) { //setFlag(QGraphicsItem::ItemIsSelectable, true); } @@ -28,24 +32,25 @@ QGVSubGraph::QGVSubGraph(Agraph_t* subGraph, QGVScene *scene): _sgraph(subGraph) QGVSubGraph::~QGVSubGraph() { _scene->removeItem(this); + delete _sgraph; } QString QGVSubGraph::name() const { - return QString::fromLocal8Bit(GD_label(_sgraph)->text); + return QString::fromLocal8Bit(GD_label(_sgraph->graph())->text); } QGVNode *QGVSubGraph::addNode(const QString &label) { - Agnode_t *node = agnode(_sgraph, NULL, TRUE); + Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE); if(node == NULL) { qWarning()<<"Invalid sub node :"<graph(), node, TRUE); - QGVNode *item = new QGVNode(node, _scene); + QGVNode *item = new QGVNode(new QGVNodePrivate(node), _scene); item->setLabel(label); _scene->addItem(item); _scene->_nodes.append(item); @@ -57,9 +62,9 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &name, bool cluster) { Agraph_t* sgraph; if(cluster) - sgraph = agsubg(_sgraph, ("cluster_" + name).toLocal8Bit().data(), TRUE); + sgraph = agsubg(_sgraph->graph(), ("cluster_" + name).toLocal8Bit().data(), TRUE); else - sgraph = agsubg(_sgraph, name.toLocal8Bit().data(), TRUE); + sgraph = agsubg(_sgraph->graph(), name.toLocal8Bit().data(), TRUE); if(sgraph == NULL) { @@ -67,7 +72,7 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &name, bool cluster) return 0; } - QGVSubGraph *item = new QGVSubGraph(sgraph, _scene); + QGVSubGraph *item = new QGVSubGraph(new QGVGraphPrivate(sgraph), _scene); _scene->_subGraphs.append(item); _scene->addItem(item); return item; @@ -92,12 +97,12 @@ void QGVSubGraph::paint(QPainter * painter, const QStyleOptionGraphicsItem * opt void QGVSubGraph::setAttribute(const QString &name, const QString &value) { - agsafeset(_sgraph, name.toLocal8Bit().data(), value.toLocal8Bit().data(), ""); + agsafeset(_sgraph->graph(), name.toLocal8Bit().data(), value.toLocal8Bit().data(), ""); } QString QGVSubGraph::getAttribute(const QString &name) const { - char* value = agget(_sgraph, name.toLocal8Bit().data()); + char* value = agget(_sgraph->graph(), name.toLocal8Bit().data()); if(value) return value; return QString(); @@ -108,13 +113,13 @@ void QGVSubGraph::updateLayout() prepareGeometryChange(); //SubGraph box - boxf box = GD_bb(_sgraph); + boxf box = GD_bb(_sgraph->graph()); pointf p1 = box.UR; pointf p2 = box.LL; _width = p1.x - p2.x; _height = p1.y - p2.y; - qreal gheight = QGVCore::graphHeight(_scene->_graph); + qreal gheight = QGVCore::graphHeight(_scene->_graph->graph()); setPos(p2.x, gheight - p1.y); _pen.setWidth(1); @@ -123,11 +128,11 @@ void QGVSubGraph::updateLayout() _pen.setColor(QGVCore::toColor(getAttribute("color"))); //SubGraph label - textlabel_t *xlabel = GD_label(_sgraph); + textlabel_t *xlabel = GD_label(_sgraph->graph()); if(xlabel) { _label = xlabel->text; _label_rect.setSize(QSize(xlabel->dimen.x, xlabel->dimen.y)); - _label_rect.moveCenter(QGVCore::toPoint(xlabel->pos, QGVCore::graphHeight(_scene->_graph)) - pos()); + _label_rect.moveCenter(QGVCore::toPoint(xlabel->pos, QGVCore::graphHeight(_scene->_graph->graph())) - pos()); } } diff --git a/QGVCore/QGVSubGraph.h b/QGVCore/QGVSubGraph.h index 19bf26b..e38ff2e 100644 --- a/QGVCore/QGVSubGraph.h +++ b/QGVCore/QGVSubGraph.h @@ -18,19 +18,20 @@ License along with this library. #ifndef QGVSUBGRAPH_H #define QGVSUBGRAPH_H -#include +#include #include #include class QGVNode; class QGVEdge; class QGVScene; +class QGVGraphPrivate; /** * @brief SubGraph item * */ -class QGVSubGraph : public QGraphicsItem +class QGVCORE_EXPORT QGVSubGraph : public QGraphicsItem { public: ~QGVSubGraph(); @@ -55,7 +56,7 @@ class QGVSubGraph : public QGraphicsItem private: friend class QGVScene; - QGVSubGraph(Agraph_t* subGraph, QGVScene *scene); + QGVSubGraph(QGVGraphPrivate* subGraph, QGVScene *scene); double _height, _width; QPen _pen; @@ -65,7 +66,7 @@ class QGVSubGraph : public QGraphicsItem QRectF _label_rect; QGVScene *_scene; - Agraph_t *_sgraph; + QGVGraphPrivate *_sgraph; QList _nodes; }; diff --git a/QGVCore/QGVCore.cpp b/QGVCore/private/QGVCore.cpp similarity index 100% rename from QGVCore/QGVCore.cpp rename to QGVCore/private/QGVCore.cpp diff --git a/QGVCore/QGVCore.h b/QGVCore/private/QGVCore.h similarity index 65% rename from QGVCore/QGVCore.h rename to QGVCore/private/QGVCore.h index 8efa675..1e6759a 100644 --- a/QGVCore/QGVCore.h +++ b/QGVCore/private/QGVCore.h @@ -49,6 +49,56 @@ class QGVCore static Qt::BrushStyle toBrushStyle(const QString &style); static Qt::PenStyle toPenStyle(const QString &style); static QColor toColor(const QString &color); + + typedef struct { + const char *data; + int len; + int cur; + } rdr_t; + + static int memiofread(void *chan, char *buf, int bufsize) + { + const char *ptr; + char *optr; + char c; + int l; + rdr_t *s; + + if (bufsize == 0) return 0; + s = (rdr_t *) chan; + if (s->cur >= s->len) + return 0; + l = 0; + ptr = s->data + s->cur; + optr = buf; + do { + *optr++ = c = *ptr++; + l++; + } while (c && (c != '\n') && (l < bufsize)); + s->cur += l; + return l; + } + + static Agraph_t *agmemread2(const char *cp) + { + Agraph_t* g; + rdr_t rdr; + Agdisc_t disc; + Agiodisc_t memIoDisc; + + memIoDisc.afread = memiofread; + memIoDisc.putstr = AgIoDisc.putstr; + memIoDisc.flush = AgIoDisc.flush; + rdr.data = cp; + rdr.len = strlen(cp); + rdr.cur = 0; + + disc.mem = &AgMemDisc; + disc.id = &AgIdDisc; + disc.io = &memIoDisc; + g = agread (&rdr, &disc); + return g; + } }; #endif // QGVCORE_H diff --git a/QGVCore/private/QGVEdgePrivate.cpp b/QGVCore/private/QGVEdgePrivate.cpp new file mode 100644 index 0000000..ae1ddfc --- /dev/null +++ b/QGVCore/private/QGVEdgePrivate.cpp @@ -0,0 +1,16 @@ +#include "QGVEdgePrivate.h" + +QGVEdgePrivate::QGVEdgePrivate(Agedge_t *edge) +{ + setEdge(edge); +} + +void QGVEdgePrivate::setEdge(Agedge_t *edge) +{ + _edge = edge; +} + +Agedge_t* QGVEdgePrivate::edge() const +{ + return _edge; +} diff --git a/QGVCore/private/QGVEdgePrivate.h b/QGVCore/private/QGVEdgePrivate.h new file mode 100644 index 0000000..f8956bc --- /dev/null +++ b/QGVCore/private/QGVEdgePrivate.h @@ -0,0 +1,18 @@ +#ifndef QGVEDGEPRIVATE_H +#define QGVEDGEPRIVATE_H + +#include + +class QGVEdgePrivate +{ + public: + QGVEdgePrivate(Agedge_t *edge = NULL); + + void setEdge(Agedge_t *edge); + Agedge_t* edge() const; + + private: + Agedge_t* _edge; +}; + +#endif // QGVEDGEPRIVATE_H diff --git a/QGVCore/private/QGVGraphPrivate.cpp b/QGVCore/private/QGVGraphPrivate.cpp new file mode 100644 index 0000000..6ec923f --- /dev/null +++ b/QGVCore/private/QGVGraphPrivate.cpp @@ -0,0 +1,16 @@ +#include "QGVGraphPrivate.h" + +QGVGraphPrivate::QGVGraphPrivate(Agraph_t *graph) +{ + setGraph(graph); +} + +void QGVGraphPrivate::setGraph(Agraph_t *graph) +{ + _graph = graph; +} + +Agraph_t* QGVGraphPrivate::graph() const +{ + return _graph; +} diff --git a/QGVCore/private/QGVGraphPrivate.h b/QGVCore/private/QGVGraphPrivate.h new file mode 100644 index 0000000..01f96a9 --- /dev/null +++ b/QGVCore/private/QGVGraphPrivate.h @@ -0,0 +1,18 @@ +#ifndef QGVGRAPHPRIVATE_H +#define QGVGRAPHPRIVATE_H + +#include + +class QGVGraphPrivate +{ + public: + QGVGraphPrivate(Agraph_t *graph = NULL); + + void setGraph(Agraph_t *graph); + Agraph_t* graph() const; + + private: + Agraph_t* _graph; +}; + +#endif // QGVGRAPHPRIVATE_H diff --git a/QGVCore/private/QGVGvcPrivate.cpp b/QGVCore/private/QGVGvcPrivate.cpp new file mode 100644 index 0000000..728b497 --- /dev/null +++ b/QGVCore/private/QGVGvcPrivate.cpp @@ -0,0 +1,16 @@ +#include "QGVGvcPrivate.h" + +QGVGvcPrivate::QGVGvcPrivate(GVC_t *context) +{ + setContext(context); +} + +void QGVGvcPrivate::setContext(GVC_t *context) +{ + _context = context; +} + +GVC_t* QGVGvcPrivate::context() const +{ + return _context; +} diff --git a/QGVCore/private/QGVGvcPrivate.h b/QGVCore/private/QGVGvcPrivate.h new file mode 100644 index 0000000..67ab07a --- /dev/null +++ b/QGVCore/private/QGVGvcPrivate.h @@ -0,0 +1,30 @@ +#ifndef QGVGVCPRIVATE_H +#define QGVGVCPRIVATE_H + +#include + +class QGVGvcPrivate +{ + public: + QGVGvcPrivate(GVC_t *context = NULL); + + void setContext(GVC_t *context); + GVC_t* context() const; + + // operators to implicit cast from QGVGvcPrivate* into GVC_t* seems not to work, + // because of typedef GVC_t +// inline operator const GVC_t* () const +// { +// return const_cast(context()); +// } + +// inline operator struct GVC_t* () +// { +// return context(); +// } + + private: + GVC_t* _context; +}; + +#endif // QGVGVCPRIVATE_H diff --git a/QGVCore/private/QGVNodePrivate.cpp b/QGVCore/private/QGVNodePrivate.cpp new file mode 100644 index 0000000..67d034c --- /dev/null +++ b/QGVCore/private/QGVNodePrivate.cpp @@ -0,0 +1,16 @@ +#include "QGVNodePrivate.h" + +QGVNodePrivate::QGVNodePrivate(Agnode_t *node) +{ + setNode(node); +} + +void QGVNodePrivate::setNode(Agnode_t *node) +{ + _node = node; +} + +Agnode_t* QGVNodePrivate::node() const +{ + return _node; +} diff --git a/QGVCore/private/QGVNodePrivate.h b/QGVCore/private/QGVNodePrivate.h new file mode 100644 index 0000000..ad07132 --- /dev/null +++ b/QGVCore/private/QGVNodePrivate.h @@ -0,0 +1,18 @@ +#ifndef QGVNODEPRIVATE_H +#define QGVNODEPRIVATE_H + +#include + +class QGVNodePrivate +{ + public: + QGVNodePrivate(Agnode_t *node = NULL); + + void setNode(Agnode_t *node); + Agnode_t* node() const; + + private: + Agnode_t* _node; +}; + +#endif // QGVNODEPRIVATE_H diff --git a/QGVCore/qgv.h b/QGVCore/qgv.h new file mode 100644 index 0000000..3eab5ca --- /dev/null +++ b/QGVCore/qgv.h @@ -0,0 +1,10 @@ +#ifndef QGV_H +#define QGV_H + +#ifdef QGVCORE_LIB + #define QGVCORE_EXPORT Q_DECL_EXPORT +#else + #define QGVCORE_EXPORT Q_DECL_IMPORT +#endif + +#endif // QGV_H diff --git a/Sample/CMakeLists.txt b/Sample/CMakeLists.txt new file mode 100644 index 0000000..5bda822 --- /dev/null +++ b/Sample/CMakeLists.txt @@ -0,0 +1,70 @@ +# enable all QT-Stuff we need +# see http://cmake.org/cmake/help/cmake2.6docs.html#module:FindQt4 for a complete list + +SET(qgv_TS +) + +SET(qgv_UI + MainWindow.ui +) + +# all files which may be mocced +SET(qgv_CPP + main.cpp + MainWindow.cpp + QGraphicsViewEc.cpp +) + +# include with QT_USE selected library parts +INCLUDE(${QT_USE_FILE}) + +INCLUDE_DIRECTORIES( + ${libqgv_SOURCE_DIR} + ${libqgv_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +# make *.h out of *.ui +QT4_WRAP_UI(qgv_UI_H ${qgv_UI}) + +# moc classes +QT4_AUTOMOC(${qgv_CPP}) + +# add translations +QT4_ADD_TRANSLATION(qgv_TRANS ${qgv_TS}) + +SET(neededStuff + ${qgv_CPP} + ${qgv_UI_H} + ${qgv_TRANS} +) + +IF(UNIX) + ADD_EXECUTABLE(sample ${neededStuff}) +ELSEIF(APPLE) + # it's with gui, so MACOSX_BUNDLE is needed + ADD_EXECUTABLE(sample MACOSX_BUNDLE ${neededStuff}) +ELSEIF(WIN32) + # it's with gui, so WIN32 is needed + ADD_EXECUTABLE(sample WIN32 ${neededStuff}) +ENDIF() +SET_TARGET_PROPERTIES(sample PROPERTIES + OUTPUT_NAME "Sample") + +TARGET_LINK_LIBRARIES(sample + ${QT_LIBRARIES} + qgvcore +) + +IF(BINDINGS_QT5) + qt5_use_modules(sample Core Widgets) + SET(CMAKE_AUTOMOC ON) +ENDIF(BINDINGS_QT5) + +# The COMPONENT option only defines the internal belonging of the INSTALL'ed thing +INSTALL( + TARGETS sample + RUNTIME DESTINATION ${bin_DIR} + COMPONENT sample +) diff --git a/Sample/MainWindow.cpp b/Sample/MainWindow.cpp index b17fc62..ffe8777 100644 --- a/Sample/MainWindow.cpp +++ b/Sample/MainWindow.cpp @@ -16,11 +16,13 @@ You should have received a copy of the GNU Lesser General Public License along with this library. ***************************************************************/ #include "MainWindow.h" +#include "moc_MainWindow.cpp" #include "ui_MainWindow.h" #include "QGVScene.h" -#include "QGVScene.h" +#include "QGVNode.h" +#include "QGVEdge.h" +#include "QGVSubGraph.h" #include -#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -33,7 +35,6 @@ MainWindow::MainWindow(QWidget *parent) : connect(_scene, SIGNAL(nodeContextMenu(QGVNode*)), SLOT(nodeContextMenu(QGVNode*))); connect(_scene, SIGNAL(nodeDoubleClick(QGVNode*)), SLOT(nodeDoubleClick(QGVNode*))); - connect(_scene, SIGNAL(edgeDoubleClick(QGVEdge*)), SLOT(nodeEdgeClick(QGVEdge*))); } MainWindow::~MainWindow() @@ -45,9 +46,11 @@ void MainWindow::drawGraph() { /* _scene->loadLayout("digraph test{node [style=filled,fillcolor=white];N1 -> N2;N2 -> N3;N3 -> N4;N4 -> N1;}"); + connect(_scene, SIGNAL(nodeContextMenu(QGVNode*)), SLOT(nodeContextMenu(QGVNode*))); + connect(_scene, SIGNAL(nodeDoubleClick(QGVNode*)), SLOT(nodeDoubleClick(QGVNode*))); + ui->graphicsView->setScene(_scene); return; */ - _scene->clear(); //Configure scene attributes _scene->setGraphAttribute("label", "DEMO"); @@ -120,6 +123,8 @@ void MainWindow::nodeContextMenu(QGVNode *node) { //Context menu exemple QMenu menu(node->label()); + + menu.addSeparator(); menu.addAction(tr("Informations")); menu.addAction(tr("Options")); @@ -130,15 +135,5 @@ void MainWindow::nodeContextMenu(QGVNode *node) void MainWindow::nodeDoubleClick(QGVNode *node) { - QMessageBox::information(this, tr("Node"), tr("Node %1").arg(node->label())); -} - -void MainWindow::nodeEdgeClick(QGVEdge *edge) -{ - QMessageBox::information(this, tr("Edge"), tr("Edge %1").arg(edge->label())); -} - -void MainWindow::on_pushButton_clicked() -{ - drawGraph(); + QMessageBox::information(this, tr("Node double clicked"), tr("Node %1").arg(node->label())); } diff --git a/Sample/MainWindow.h b/Sample/MainWindow.h index 348e1f3..6cba10d 100644 --- a/Sample/MainWindow.h +++ b/Sample/MainWindow.h @@ -32,14 +32,11 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); + void drawGraph(); private slots: - void drawGraph(); void nodeContextMenu(QGVNode* node); void nodeDoubleClick(QGVNode* node); - void nodeEdgeClick(QGVEdge *edge); - - void on_pushButton_clicked(); private: Ui::MainWindow *ui; diff --git a/Sample/MainWindow.ui b/Sample/MainWindow.ui index e4c975c..5811992 100644 --- a/Sample/MainWindow.ui +++ b/Sample/MainWindow.ui @@ -11,17 +11,10 @@ - QGV Sample + MainWindow - - - - Draw - - - @@ -34,6 +27,25 @@ + + + + 0 + 0 + 817 + 21 + + + + + + TopToolBarArea + + + false + + + diff --git a/Sample/QGraphicsViewEc.cpp b/Sample/QGraphicsViewEc.cpp index 65ac482..4c27dfc 100644 --- a/Sample/QGraphicsViewEc.cpp +++ b/Sample/QGraphicsViewEc.cpp @@ -16,6 +16,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library. ***************************************************************/ #include "QGraphicsViewEc.h" +#include "moc_QGraphicsViewEc.cpp" #include #include diff --git a/Sample/main.cpp b/Sample/main.cpp index 98927cf..89d87be 100644 --- a/Sample/main.cpp +++ b/Sample/main.cpp @@ -23,6 +23,8 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; w.show(); - //w.drawGraph(); + + w.drawGraph(); + return a.exec(); } diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in new file mode 100644 index 0000000..d116bc6 --- /dev/null +++ b/cmake/cmake_uninstall.cmake.in @@ -0,0 +1,40 @@ +###################### +# +# Copyright (C) 2010 EngSaS - Engineering Solutions and Services Langenbach. All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +###################### + +IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + MESSAGE(FATAL_ERROR "Cannot find install manifest: "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt"") +ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + +FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +STRING(REGEX REPLACE "\n" ";" files "${files}") +FOREACH(file ${files}) + MESSAGE(STATUS "Uninstalling "$ENV{DESTDIR}${file}"") + IF(EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove "$ENV{DESTDIR}${file}"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing "$ENV{DESTDIR}${file}"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSE(EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "File "$ENV{DESTDIR}${file}" does not exist.") + ENDIF(EXISTS "$ENV{DESTDIR}${file}") +ENDFOREACH(file) \ No newline at end of file diff --git a/cmake/modules/FindGraphviz.cmake b/cmake/modules/FindGraphviz.cmake new file mode 100644 index 0000000..1f9708c --- /dev/null +++ b/cmake/modules/FindGraphviz.cmake @@ -0,0 +1,89 @@ +# - Try to find Graphviz cgraph library +# Once done this will define +# +# GRAPHVIZ_FOUND - system has Graphviz installed +# GRAPHVIZ_INCLUDE_DIR +# GRAPHVIZ_GVC_LIBRARY +# GRAPHVIZ_CGRAPH_LIBRARY +# GRAPHVIZ_CDT_LIBRARY +# +# + +if ( GRAPHVIZ_CGRAPH_LIBRARY ) + # in cache already + SET(Graphviz_FIND_QUIETLY TRUE) +endif ( GRAPHVIZ_CGRAPH_LIBRARY ) + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +if( NOT WIN32 ) + find_package(PkgConfig) + + pkg_check_modules(GRAPHVIZ_GVC_PKG gvc) + pkg_check_modules(GRAPHVIZ_CGRAPH_PKG cgraph) + pkg_check_modules(GRAPHVIZ_CDT_PKG cdt) +endif( NOT WIN32 ) + +FIND_LIBRARY(GRAPHVIZ_GVC_LIBRARY NAMES gvc libgvc + PATHS + /usr/lib + /usr/local/lib + HINTS + ${GRAPHVIZ_GVC_PKG_LIBRARY_DIRS} # Generated by pkg-config +) +IF ( NOT(GRAPHVIZ_GVC_LIBRARY) ) + MESSAGE(STATUS "Could not find libgvc." ) + SET(GRAPHVIZ_GVC_FOUND FALSE) +ELSE () + SET(GRAPHVIZ_GVC_FOUND TRUE) +ENDIF () + +FIND_LIBRARY(GRAPHVIZ_CGRAPH_LIBRARY NAMES cgraph libcgraph + PATHS + /usr/lib + /usr/local/lib + HINTS + ${GRAPHVIZ_CGRAPH_PKG_LIBRARY_DIRS} # Generated by pkg-config +) +IF ( NOT(GRAPHVIZ_CGRAPH_LIBRARY) ) + MESSAGE(STATUS "Could not find libcgraph." ) + SET(GRAPHVIZ_CGRAPH_FOUND FALSE) +ELSE () + SET(GRAPHVIZ_CGRAPH_FOUND TRUE) +ENDIF () + +FIND_LIBRARY(GRAPHVIZ_CDT_LIBRARY NAMES cdt libcdt + PATHS + /usr/lib + /usr/local/lib + HINTS + ${GRAPHVIZ_CDT_PKG_LIBRARY_DIRS} # Generated by pkg-config +) +IF ( NOT(GRAPHVIZ_CDT_LIBRARY) ) + MESSAGE(STATUS "Could not find libcdt." ) + SET(GRAPHVIZ_CDT_FOUND FALSE) +ELSE () + SET(GRAPHVIZ_CDT_FOUND TRUE) +ENDIF () + +FIND_LIBRARY(GRAPHVIZ_INCLUDE_DIR NAMES cgraph.h + PATHS + /usr/include + /usr/local/include + HINTS + ${GRAPHVIZ_PKG_INCLUDE_DIR} # Generated by pkg-config +) +IF ( NOT(GRAPHVIZ_INCLUDE_DIR) ) + MESSAGE(STATUS "Could not find graphviz headers." ) +ENDIF () + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Graphviz_Gvc DEFAULT_MSG GRAPHVIZ_GVC_LIBRARY ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Graphviz_Cgraph DEFAULT_MSG GRAPHVIZ_CGRAPH_LIBRARY ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Graphviz_Cdt DEFAULT_MSG GRAPHVIZ_CDT_LIBRARY ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS("Graphviz Headers" DEFAULT_MSG GRAPHVIZ_INCLUDE_DIR ) + + +# show the POPPLER_(XPDF/QT4)_INCLUDE_DIR and POPPLER_LIBRARIES variables only in the advanced view +MARK_AS_ADVANCED(GRAPHVIZ_INCLUDE_DIR GRAPHVIZ_GVC_LIBRARY GRAPHVIZ_CGRAPH_LIBRARY GRAPHVIZ_CDT_LIBRARY) +