From cd8496f14a047d0c1928d7d11c208246bee1f2aa Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Jun 2015 18:44:04 +0300 Subject: [PATCH] Variouis minor fixes --- CMakeLists.txt | 70 ++++++++++-------- INSTALL | 7 +- README | 6 +- SalomeDXFPLUGINConfig.cmake.in | 10 ++- adm_local/cmake_files/FindDXF.cmake | 4 +- doc/CMakeLists.txt | 0 doc/salome/CMakeLists.txt | 0 doc/salome/gui/CMakeLists.txt | 0 doc/salome/gui/DXFPLUGIN/CMakeLists.txt | 0 doc/salome/gui/DXFPLUGIN/doxyfile.in | 0 doc/salome/gui/DXFPLUGIN/doxyfile_py.in | 2 +- doc/salome/gui/DXFPLUGIN/images/head.png | Bin .../input/dxfplugin_importexport_page.doc | 8 +- .../input/dxfplugin_python_interface_page.doc | 6 +- doc/salome/gui/DXFPLUGIN/static/footer.html | 0 .../gui/DXFPLUGIN/static/header.html.in | 0 .../gui/DXFPLUGIN/static/salome_extra.css | 2 +- idl/CMakeLists.txt | 1 - idl/DXFPlugin.idl | 1 - resources/SalomeApp.xml | 2 +- src/CMakeLists.txt | 3 +- src/DXFPlugin_Engine.hxx | 0 src/DXFPlugin_ExportDriver.cxx | 3 +- src/DXFPlugin_GUI.cxx | 2 +- src/DXFPlugin_IECallBack.cxx | 1 - src/DXFPlugin_ImportDriver.cxx | 3 +- src/DXFPlugin_OperationsCreator.hxx | 0 src/resources/DXFPlugin_msg_fr.ts | 2 +- src/resources/DXFPlugin_msg_ja.ts | 2 +- 29 files changed, 74 insertions(+), 61 deletions(-) mode change 100755 => 100644 doc/CMakeLists.txt mode change 100755 => 100644 doc/salome/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/DXFPLUGIN/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/DXFPLUGIN/doxyfile.in mode change 100755 => 100644 doc/salome/gui/DXFPLUGIN/doxyfile_py.in mode change 100755 => 100644 doc/salome/gui/DXFPLUGIN/images/head.png mode change 100755 => 100644 doc/salome/gui/DXFPLUGIN/static/footer.html mode change 100755 => 100644 doc/salome/gui/DXFPLUGIN/static/header.html.in mode change 100755 => 100644 idl/CMakeLists.txt mode change 100755 => 100644 src/DXFPlugin_Engine.hxx mode change 100755 => 100644 src/DXFPlugin_IECallBack.cxx mode change 100755 => 100644 src/DXFPlugin_OperationsCreator.hxx diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f8d3c8..e005770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ PROJECT(SalomeDXFPLUGIN C CXX) CMAKE_POLICY(SET CMP0003 NEW) # Versioning -# =========== +# ========== # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) @@ -37,16 +37,16 @@ SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Find KERNEL # =========== -SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") +SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the SALOME KERNEL") IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) - KERNEL_WITH_CORBA() #check whether KERNEL builded with CORBA + KERNEL_WITH_CORBA() #check whether KERNEL is built with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) - MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") + MESSAGE(FATAL_ERROR "We absolutely need a SALOME KERNEL, please define KERNEL_ROOT_DIR") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) # Platform setup @@ -58,61 +58,62 @@ SET(BUILD_SHARED_LIBS TRUE) LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # Find GEOM -# =========== -SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM") +# ========= +SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the SALOME Geometry") IF(EXISTS ${GEOM_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGEOM REQUIRED) ADD_DEFINITIONS(${GEOM_DEFINITIONS}) INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS}) ELSE(EXISTS ${GEOM_ROOT_DIR}) - MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR") + MESSAGE(FATAL_ERROR "We absolutely need a SALOME Geometry, please define GEOM_ROOT_DIR") ENDIF(EXISTS ${GEOM_ROOT_DIR}) -SET(SALOME_BUILD_GUI ${SALOME_GEOM_BUILD_GUI}) +# User options +# ============ +OPTION(SALOME_BUILD_GUI "Enable GUI" ${SALOME_GEOM_BUILD_GUI}) +OPTION(SALOME_BUILD_DOC "Generate SALOME DXFPLUGIN documentation" ON) +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) +OPTION(DXF_READ_LICENSE "OCCT DXF read license key" "") +OPTION(DXF_WRITE_LICENSE "OCCT DXF write license key" "") -# Find GUI(optional) +# Find GUI (optional) +# =================== IF(SALOME_BUILD_GUI) - SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") + SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the SALOME GUI") IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI) - FULL_GUI(FALSE) #check whether GUI builded in full mode and with CORBA + FULL_GUI(FALSE) ADD_DEFINITIONS(${GUI_DEFINITIONS}) INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS}) ELSE(EXISTS ${GUI_ROOT_DIR}) - MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, DXFPLUGIN will be built without GUI!!!") + MESSAGE(FATAL_ERROR "We absolutely need a SALOME GUI, please define GUI_ROOT_DIR") ENDIF(EXISTS ${GUI_ROOT_DIR}) + IF(NOT SALOME_GEOM_BUILD_GUI) + MESSAGE(FATAL_ERROR "SALOME Geometry module is built without GUI") + ENDIF(NOT SALOME_GEOM_BUILD_GUI) SALOME_LOG_OPTIONAL_PACKAGE(SalomeGUI SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI) -# User options -# ============ -OPTION(SALOME_BUILD_DOC "Generate SALOME DXFPLUGIN documentation" ON) -OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) - IF(SALOME_BUILD_TESTS) ENABLE_TESTING() ENDIF() -OPTION(DXF_READ_LICENSE "DXF read license key" "") -OPTION(DXF_WRITE_LICENSE "DXF write license key" "") IF(DXF_READ_LICENSE OR DXF_WRITE_LICENSE) IF(NOT DXF_READ_LICENSE) - MESSAGE(WARNING "DXF read license key is not specified! Runtime license will be required!") + MESSAGE(WARNING "OCCT DXF read license key is not specified! Runtime license will be required!") ELSEIF(NOT DXF_WRITE_LICENSE) - MESSAGE(WARNING "DXF write license key is not specified! Runtime license will be required!") + MESSAGE(WARNING "OCCT DXF write license key is not specified! Runtime license will be required!") ENDIF() ADD_DEFINITIONS(-DDXF_HASLICENSE) ELSE() - MESSAGE(WARNING "DXF read/write license keys are not specified! Runtime license will be required!") + MESSAGE(WARNING "OCCT DXF read/write license keys are not specified! Runtime license will be required!") ENDIF() -## -## DXFPLUGIN specifics -## - +# Pre-requisites +# ============== FIND_PACKAGE(SalomePython REQUIRED) FIND_PACKAGE(SalomeCAS REQUIRED) FIND_PACKAGE(SalomeDXF REQUIRED) @@ -120,16 +121,20 @@ FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) IF(SALOME_BUILD_GUI) FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) -ENDIF() +ENDIF(SALOME_BUILD_GUI) IF(SALOME_BUILD_DOC) FIND_PACKAGE(SalomeDoxygen) SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) ENDIF() +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() + # Directories # =========== SET(SALOME_INSTALL_BINS bin/salome CACHE PATH "Install path: SALOME binaries") SET(SALOME_INSTALL_LIBS lib/salome CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_IDLS idl/salome CACHE PATH "Install path: SALOME IDL files") SET(SALOME_INSTALL_HEADERS include/salome CACHE PATH "Install path: SALOME headers") SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH "Install path: local SALOME CMake files") @@ -141,22 +146,23 @@ SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: S SET(SALOME_DXFPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/dxfplugin" CACHE PATH. "Install path: SALOME DXFPLUGIN specific data") -MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_HEADERS) +MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_DXFPLUGIN_INSTALL_RES_DATA) # Accumulate environment variables for DXFPLUGIN module SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) # Sources -# ======== +# ======= ADD_SUBDIRECTORY(idl) ADD_SUBDIRECTORY(adm_local) ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(src) IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) -ENDIF() +ENDIF(SALOME_BUILD_DOC) # Header configuration # ==================== @@ -178,7 +184,7 @@ IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets DXFPluginGUI ) -ENDIF() +ENDIF(SALOME_BUILD_GUI) # Add all targets to the build-tree export set EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} @@ -205,7 +211,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} COMPATIBILITY AnyNewerVersion) - + # Install the CMake configuration files: INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" diff --git a/INSTALL b/INSTALL index 52afaa3..e848b45 100644 --- a/INSTALL +++ b/INSTALL @@ -26,9 +26,10 @@ Pre-requisites DXF plugin for SALOME Geometry module requires: -- SALOME, at least KERNEL module (http://www.salome-platform.org). +- SALOME, at least KERNEL and GEOM modules (http://www.salome-platform.org). - Open CASCADE Technology and OCCT DXF Import/Export XDE product (http://www.opencascade.org). +- Other pre-requisite products, according to the SALOME pre-requisites list. ================== Basic Installation @@ -58,12 +59,12 @@ In order to build the plugin you have to do the following actions: - for csh: - % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.7.0 + % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.9.0 % setenv LD_LIBRARY_PATH ${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} - for bash: - % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.7.0 + % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.9.0 % export LD_LIBRARY_PATH=${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} 2. Create a build directory (in the example below, it is assumed diff --git a/README b/README index 7ca460d..41a1927 100644 --- a/README +++ b/README @@ -74,15 +74,15 @@ Usage - for csh: - % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.7.0 + % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.9.0 % setenv LD_LIBRARY_PATH ${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} - for bash: - % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.7.0 + % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.9.0 % export LD_LIBRARY_PATH=${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} -2. Using in SALOME +2. Usage in SALOME * Run SALOME and activate Geometry module. diff --git a/SalomeDXFPLUGINConfig.cmake.in b/SalomeDXFPLUGINConfig.cmake.in index fcb7203..8f90c6e 100644 --- a/SalomeDXFPLUGINConfig.cmake.in +++ b/SalomeDXFPLUGINConfig.cmake.in @@ -1,5 +1,6 @@ # Config file for the @PROJECT_NAME@ package # It defines the following variables: +# Specific to the pacakge @PROJECT_NAME@ itself: # @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # @@ -39,7 +40,6 @@ SET_AND_CHECK(DXFPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories SET_AND_CHECK(DXFPLUGIN_INCLUDE_DIRS "${DXFPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") SET(DXFPLUGIN_INCLUDE_DIRS "${DXFPLUGIN_INCLUDE_DIRS};@_SalomeDXFPLUGIN_EXTRA_HEADERS@") -SET(DXFPLUGIN_DEFINITIONS) # Package specific environment variables @_SalomeDXFPLUGIN_EXTRA_ENV_FULL@ @@ -49,6 +49,7 @@ SET(DXFPLUGIN_DEFINITIONS) # Options exported by the package: SET(SALOME_DXFPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) SET(SALOME_DXFPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_DXFPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@) # Level 1 prerequisites: SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") @@ -90,10 +91,17 @@ ENDIF() # Installation directories SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") + +# Include GEOM targets if they were not already loaded: +IF(NOT (TARGET GEOMEngine)) + INCLUDE("${GEOM_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeGEOMTargets.cmake") +ENDIF() # Exposed DXFPLUGIN targets: SET(DXFPLUGIN_SalomeIDLDXFPlugin SalomeIDLDXFPlugin) diff --git a/adm_local/cmake_files/FindDXF.cmake b/adm_local/cmake_files/FindDXF.cmake index 7301c27..951449b 100644 --- a/adm_local/cmake_files/FindDXF.cmake +++ b/adm_local/cmake_files/FindDXF.cmake @@ -1,7 +1,7 @@ # - Find OCCT DXF XDE product # Sets the following variables: -# DXF_INCLUDE_DIRS - path to the DXF include directory -# DXF_LIBRARIES - path to the DXF libraries to be linked against +# DXF_INCLUDE_DIRS - path to the OCCT DXF XDE include directory +# DXF_LIBRARIES - OCCT DXF XDE libraries to be linked against # ######################################################################### diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/DXFPLUGIN/CMakeLists.txt b/doc/salome/gui/DXFPLUGIN/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/DXFPLUGIN/doxyfile.in b/doc/salome/gui/DXFPLUGIN/doxyfile.in old mode 100755 new mode 100644 diff --git a/doc/salome/gui/DXFPLUGIN/doxyfile_py.in b/doc/salome/gui/DXFPLUGIN/doxyfile_py.in old mode 100755 new mode 100644 index 46b644e..12b00b3 --- a/doc/salome/gui/DXFPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/DXFPLUGIN/doxyfile_py.in @@ -96,7 +96,7 @@ EXAMPLE_RECURSIVE = NO #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = tmp @CMAKE_SOURCE_DIR@/idl/DXFPlugin_Gen.idl +INPUT = tmp @CMAKE_SOURCE_DIR@/idl/DXFPlugin.idl FILE_PATTERNS = IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images RECURSIVE = NO diff --git a/doc/salome/gui/DXFPLUGIN/images/head.png b/doc/salome/gui/DXFPLUGIN/images/head.png old mode 100755 new mode 100644 diff --git a/doc/salome/gui/DXFPLUGIN/input/dxfplugin_importexport_page.doc b/doc/salome/gui/DXFPLUGIN/input/dxfplugin_importexport_page.doc index 335707b..1392464 100644 --- a/doc/salome/gui/DXFPLUGIN/input/dxfplugin_importexport_page.doc +++ b/doc/salome/gui/DXFPLUGIN/input/dxfplugin_importexport_page.doc @@ -2,11 +2,11 @@ \page dxfplugin_importexport_page Import/Export DXF -For using DXFPLUGIN functionalities in SALOME: +To use DXFPLUGIN functionalities in SALOME: - Run SALOME and activate Geometry module. -- Import the DXF file from menu File/Import/DXF. +- Import the DXF file from menu \b File - \b Import - \b DXF. \image html import_dxf.png @@ -14,13 +14,13 @@ For using DXFPLUGIN functionalities in SALOME: will appear in the SALOME object browser. \note It is possible to re-load a previously imported shape from the initial file if - the file has been changed on disk. For this, select Reload From Disk item + the file has been changed on disk. To do this, select Reload From Disk item in the Object browser's context menu of the imported shape. The reloaded shape will have the same representation parameters as before this operation. \image html reopen_dxf.png -- Export selected shape to the DXF file via File/Export/DXF menu. +- Export selected shape to the DXF file via \b File - \b Export - \b DXF menu. \image html export_dxf.png diff --git a/doc/salome/gui/DXFPLUGIN/input/dxfplugin_python_interface_page.doc b/doc/salome/gui/DXFPLUGIN/input/dxfplugin_python_interface_page.doc index 3ab4f34..dfd78ac 100644 --- a/doc/salome/gui/DXFPLUGIN/input/dxfplugin_python_interface_page.doc +++ b/doc/salome/gui/DXFPLUGIN/input/dxfplugin_python_interface_page.doc @@ -5,15 +5,13 @@ Python package DXFPluginBuilder defines several functions that allow importing and exporting CAD models in DXF format (*.dxf files). -DXFPLUGIN dynamically adds several methods to the geomBuilder. +DXFPLUGIN dynamically adds these methods to the geomBuilder. Below you can see an example of usage of the DXFPluginBuilder package for import and export CAD models: \anchor example_DXFPlugin -

Example of import/export CAD model stored in DXF format (*.dxf files) with DXFPLUGIN:

+

Example: importing/exporting CAD model stored in DXF format (*.dxf files) with DXFPLUGIN:

\tui_script{DXFPlugindemo.py} */ - - diff --git a/doc/salome/gui/DXFPLUGIN/static/footer.html b/doc/salome/gui/DXFPLUGIN/static/footer.html old mode 100755 new mode 100644 diff --git a/doc/salome/gui/DXFPLUGIN/static/header.html.in b/doc/salome/gui/DXFPLUGIN/static/header.html.in old mode 100755 new mode 100644 diff --git a/doc/salome/gui/DXFPLUGIN/static/salome_extra.css b/doc/salome/gui/DXFPLUGIN/static/salome_extra.css index 3e8b838..802088e 100644 --- a/doc/salome/gui/DXFPLUGIN/static/salome_extra.css +++ b/doc/salome/gui/DXFPLUGIN/static/salome_extra.css @@ -26,4 +26,4 @@ div.version { .navpath li.footer { line-height:15px; text-align: right; -} \ No newline at end of file +} diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt old mode 100755 new mode 100644 index c0eff38..26a5230 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -37,7 +37,6 @@ SET(SalomeIDLDXFPlugin_IDLSOURCES SET(IDL_INCLUDE_DIRS ${KERNEL_ROOT_DIR}/idl/salome ${GEOM_ROOT_DIR}/idl/salome - ${CMAKE_CURRENT_SOURCE_DIR} ) SET(IDL_LINK_FLAGS ${KERNEL_SalomeIDLKernel} diff --git a/idl/DXFPlugin.idl b/idl/DXFPlugin.idl index 867adcb..655194c 100644 --- a/idl/DXFPlugin.idl +++ b/idl/DXFPlugin.idl @@ -49,4 +49,3 @@ module DXFPlugin }; #endif // __DXFPlugin_IDL__ - diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index ba8da96..e792b38 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -4,7 +4,7 @@ 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. + 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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 52332c6..fabc216 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,15 +29,16 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${DXF_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl + ${CMAKE_CURRENT_BINARY_DIR} ) IF(SALOME_BUILD_GUI) INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} - ${GEOM_INCLUDE_DIRS} ) ENDIF() diff --git a/src/DXFPlugin_Engine.hxx b/src/DXFPlugin_Engine.hxx old mode 100755 new mode 100644 diff --git a/src/DXFPlugin_ExportDriver.cxx b/src/DXFPlugin_ExportDriver.cxx index 9682266..5aea0ab 100644 --- a/src/DXFPlugin_ExportDriver.cxx +++ b/src/DXFPlugin_ExportDriver.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef DXF_HASLICENSE #include "DXFPlugin_license.h" @@ -70,7 +71,7 @@ Standard_Integer DXFPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const OCCLicense_Activate("DXF-W-"OCC_VERSION_STRING, DXF_WRITE_LICENSE); } catch (Standard_LicenseError) { - return 1; + return 0; } #endif // DXF_HASLICENSE diff --git a/src/DXFPlugin_GUI.cxx b/src/DXFPlugin_GUI.cxx index e4a64cc..3986c79 100644 --- a/src/DXFPlugin_GUI.cxx +++ b/src/DXFPlugin_GUI.cxx @@ -256,7 +256,7 @@ bool DXFPlugin_GUI::exportDXF( SUIT_Desktop* parent ) extern "C" { #ifdef WIN32 - __declspec( dllexport ) + __declspec( dllexport ) #endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { diff --git a/src/DXFPlugin_IECallBack.cxx b/src/DXFPlugin_IECallBack.cxx old mode 100755 new mode 100644 index 4411ef1..03bd999 --- a/src/DXFPlugin_IECallBack.cxx +++ b/src/DXFPlugin_IECallBack.cxx @@ -68,4 +68,3 @@ DXFPlugin_IECallBack::Import( int theDocId, DXFPlugin_IOperations* aPluginOperations = DXFPlugin_OperationsCreator::get( GetEngine(), theDocId ); return aPluginOperations->ImportDXF( theFileName ); } - diff --git a/src/DXFPlugin_ImportDriver.cxx b/src/DXFPlugin_ImportDriver.cxx index c69c82e..0c2ee73 100644 --- a/src/DXFPlugin_ImportDriver.cxx +++ b/src/DXFPlugin_ImportDriver.cxx @@ -50,6 +50,7 @@ #include #include +#include #ifdef DXF_HASLICENSE #include "DXFPlugin_license.h" @@ -98,7 +99,7 @@ Standard_Integer DXFPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const OCCLicense_Activate( "DXF-R-"OCC_VERSION_STRING, DXF_READ_LICENSE); } catch (Standard_LicenseError) { - return aResShape; + return 0; } #endif diff --git a/src/DXFPlugin_OperationsCreator.hxx b/src/DXFPlugin_OperationsCreator.hxx old mode 100755 new mode 100644 diff --git a/src/resources/DXFPlugin_msg_fr.ts b/src/resources/DXFPlugin_msg_fr.ts index 54f35a2..fb7bbdc 100644 --- a/src/resources/DXFPlugin_msg_fr.ts +++ b/src/resources/DXFPlugin_msg_fr.ts @@ -43,4 +43,4 @@ Importer DXF - \ No newline at end of file + diff --git a/src/resources/DXFPlugin_msg_ja.ts b/src/resources/DXFPlugin_msg_ja.ts index 6c6461e..0932a71 100644 --- a/src/resources/DXFPlugin_msg_ja.ts +++ b/src/resources/DXFPlugin_msg_ja.ts @@ -43,4 +43,4 @@ Import DXF - \ No newline at end of file + -- 2.30.2