From ac3a827e5470ffb7d80acaa36186b215daf9ed0d Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Jun 2015 18:39:08 +0300 Subject: [PATCH] Various minor fixes --- CMakeLists.txt | 71 ++++++++++-------- INSTALL | 7 +- README | 6 +- SalomeACISPLUGINConfig.cmake.in | 10 ++- adm_local/cmake_files/FindACIS.cmake | 5 +- doc/CMakeLists.txt | 0 doc/salome/CMakeLists.txt | 2 +- doc/salome/gui/ACISPLUGIN/CMakeLists.txt | 0 doc/salome/gui/ACISPLUGIN/doxyfile.in | 0 doc/salome/gui/ACISPLUGIN/doxyfile_py.in | 2 +- doc/salome/gui/ACISPLUGIN/images/head.png | Bin .../input/acisplugin_importexport_page.doc | 10 +-- .../acisplugin_python_interface_page.doc | 6 +- doc/salome/gui/ACISPLUGIN/static/footer.html | 0 .../gui/ACISPLUGIN/static/header.html.in | 0 .../gui/ACISPLUGIN/static/salome_extra.css | 2 +- doc/salome/gui/CMakeLists.txt | 0 idl/CMakeLists.txt | 1 - resources/SalomeApp.xml | 2 +- src/ACISPlugin_Engine.hxx | 0 src/ACISPlugin_ExportDriver.cxx | 3 +- src/ACISPlugin_GUI.cxx | 2 +- src/ACISPlugin_IECallBack.cxx | 1 - src/ACISPlugin_ImportDriver.cxx | 3 +- src/CMakeLists.txt | 3 +- src/resources/ACISPlugin_msg_fr.ts | 2 +- src/resources/ACISPlugin_msg_ja.ts | 2 +- 27 files changed, 76 insertions(+), 64 deletions(-) mode change 100755 => 100644 doc/CMakeLists.txt mode change 100755 => 100644 doc/salome/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/ACISPLUGIN/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/ACISPLUGIN/doxyfile.in mode change 100755 => 100644 doc/salome/gui/ACISPLUGIN/doxyfile_py.in mode change 100755 => 100644 doc/salome/gui/ACISPLUGIN/images/head.png mode change 100755 => 100644 doc/salome/gui/ACISPLUGIN/static/footer.html mode change 100755 => 100644 doc/salome/gui/ACISPLUGIN/static/header.html.in mode change 100755 => 100644 doc/salome/gui/CMakeLists.txt mode change 100755 => 100644 idl/CMakeLists.txt mode change 100755 => 100644 src/ACISPlugin_Engine.hxx mode change 100755 => 100644 src/ACISPlugin_IECallBack.cxx diff --git a/CMakeLists.txt b/CMakeLists.txt index ccbfedc..45c4d36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ PROJECT(SalomeACISPLUGIN 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,61 @@ 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 ACISPLUGIN documentation" ON) +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) +OPTION(ACIS_READ_LICENSE "OCCT SAT/ACIS read license key" "") +OPTION(ACIS_WRITE_LICENSE "OCCT SAT/ACIS 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, ACISPLUGIN 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 ACISPLUGIN documentation" ON) -OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) - IF(SALOME_BUILD_TESTS) ENABLE_TESTING() ENDIF() -OPTION(ACIS_READ_LICENSE "ACIS read license key" "") -OPTION(ACIS_WRITE_LICENSE "ACIS write license key" "") - IF(ACIS_READ_LICENSE OR ACIS_WRITE_LICENSE) IF(NOT ACIS_READ_LICENSE) - MESSAGE(WARNING "ACIS read license key is not specified! Runtime license will be required!") + MESSAGE(WARNING "OCCT ACIS read license key is not specified! Runtime license will be required!") ELSEIF(NOT ACIS_WRITE_LICENSE) - MESSAGE(WARNING "ACIS write license key is not specified! Runtime license will be required!") + MESSAGE(WARNING "OCCT ACIS write license key is not specified! Runtime license will be required!") ENDIF() ADD_DEFINITIONS(-DACIS_HASLICENSE) ELSE() - MESSAGE(WARNING "ACIS read/write license keys are not specified! Runtime license will be required!") + MESSAGE(WARNING "OCCT ACIS read/write license keys are not specified! Runtime license will be required!") ENDIF() -## -## ACISPLUGIN specifics -## - +# Pre-requisites +# ============== FIND_PACKAGE(SalomePython REQUIRED) FIND_PACKAGE(SalomeCAS REQUIRED) FIND_PACKAGE(SalomeACIS REQUIRED) @@ -120,16 +120,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 +145,23 @@ SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: S SET(SALOME_ACISPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/acisplugin" CACHE PATH. "Install path: SALOME ACISPLUGIN 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_ACISPLUGIN_INSTALL_RES_DATA) # Accumulate environment variables for ACISPLUGIN 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 +183,7 @@ IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets ACISPluginGUI ) -ENDIF() +ENDIF(SALOME_BUILD_GUI) # Add all targets to the build-tree export set EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} @@ -205,7 +210,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 8739dd4..df15d83 100644 --- a/INSTALL +++ b/INSTALL @@ -26,9 +26,10 @@ Pre-requisites ACIS 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 ACIS/SAT 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 fe7dd3c..f99fafa 100644 --- a/README +++ b/README @@ -74,12 +74,12 @@ 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} * Set CSF_SATDefaults variable to point to the OCCT ACIS/SAT XDE product @@ -93,7 +93,7 @@ Usage % export CSF_SATDefaults=${ACIS_ROOT_DIR}/src/XSTEPResourceAdv -2. Using in SALOME +2. Usage in SALOME * Run SALOME and activate Geometry module. diff --git a/SalomeACISPLUGINConfig.cmake.in b/SalomeACISPLUGINConfig.cmake.in index ad13705..a4fa394 100644 --- a/SalomeACISPLUGINConfig.cmake.in +++ b/SalomeACISPLUGINConfig.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(ACISPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories SET_AND_CHECK(ACISPLUGIN_INCLUDE_DIRS "${ACISPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") SET(ACISPLUGIN_INCLUDE_DIRS "${ACISPLUGIN_INCLUDE_DIRS};@_SalomeACISPLUGIN_EXTRA_HEADERS@") -SET(ACISPLUGIN_DEFINITIONS) # Package specific environment variables @_SalomeACISPLUGIN_EXTRA_ENV_FULL@ @@ -49,6 +49,7 @@ SET(ACISPLUGIN_DEFINITIONS) # Options exported by the package: SET(SALOME_ACISPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) SET(SALOME_ACISPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_ACISPLUGIN_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 ACISPLUGIN targets: SET(ACISPLUGIN_SalomeIDLACISPlugin SalomeIDLACISPlugin) diff --git a/adm_local/cmake_files/FindACIS.cmake b/adm_local/cmake_files/FindACIS.cmake index 776f3bf..60eda27 100644 --- a/adm_local/cmake_files/FindACIS.cmake +++ b/adm_local/cmake_files/FindACIS.cmake @@ -1,7 +1,7 @@ # - Find OCCT ACIS/SAT XDE product # Sets the following variables: -# ACIS_INCLUDE_DIRS - path to the ACIS include directory -# ACIS_LIBRARIES - path to the ACIS libraries to be linked against +# ACIS_INCLUDE_DIRS - path to the OCCT SAT/ACIS XDE include directory +# ACIS_LIBRARIES - OCCT SAT/ACIS XDE libraries to be linked against # ######################################################################### @@ -46,7 +46,6 @@ IF(OCCTLICENSE_INCLUDE_DIRS) LIST(APPEND ACIS_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS}) ENDIF(OCCTLICENSE_INCLUDE_DIRS) - FIND_LIBRARY(ACIS_TKACIS NAMES TKACIS) FIND_LIBRARY(ACIS_TKSAT NAMES TKSAT) FIND_LIBRARY(ACIS_TKXDESAT NAMES TKXDESAT) 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 index dc3f208..9965b85 --- a/doc/salome/CMakeLists.txt +++ b/doc/salome/CMakeLists.txt @@ -18,4 +18,4 @@ # ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(gui) \ No newline at end of file +ADD_SUBDIRECTORY(gui) diff --git a/doc/salome/gui/ACISPLUGIN/CMakeLists.txt b/doc/salome/gui/ACISPLUGIN/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/ACISPLUGIN/doxyfile.in b/doc/salome/gui/ACISPLUGIN/doxyfile.in old mode 100755 new mode 100644 diff --git a/doc/salome/gui/ACISPLUGIN/doxyfile_py.in b/doc/salome/gui/ACISPLUGIN/doxyfile_py.in old mode 100755 new mode 100644 index e3fae44..00779e4 --- a/doc/salome/gui/ACISPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/ACISPLUGIN/doxyfile_py.in @@ -96,7 +96,7 @@ EXAMPLE_RECURSIVE = NO #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = tmp @CMAKE_SOURCE_DIR@/idl/ACISPlugin_Gen.idl +INPUT = tmp @CMAKE_SOURCE_DIR@/idl/ACISPlugin.idl FILE_PATTERNS = IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images RECURSIVE = NO diff --git a/doc/salome/gui/ACISPLUGIN/images/head.png b/doc/salome/gui/ACISPLUGIN/images/head.png old mode 100755 new mode 100644 diff --git a/doc/salome/gui/ACISPLUGIN/input/acisplugin_importexport_page.doc b/doc/salome/gui/ACISPLUGIN/input/acisplugin_importexport_page.doc index 84d30b6..d1538d4 100644 --- a/doc/salome/gui/ACISPLUGIN/input/acisplugin_importexport_page.doc +++ b/doc/salome/gui/ACISPLUGIN/input/acisplugin_importexport_page.doc @@ -2,11 +2,11 @@ \page acisplugin_importexport_page Import/Export ACIS -For using ACISPLUGIN functionalities in SALOME: +To use ACISPLUGIN functionalities in SALOME: - Run SALOME and activate Geometry module. -- Import the ACIS file from menu File/Import/ACIS. +- Import the ACIS file from menu \b File - \b Import - \b ACIS. \image html import_acis.png @@ -14,18 +14,18 @@ For using ACISPLUGIN functionalities in SALOME: will appear in the SALOME object browser. \note If the file contains named shapes, the user will be asked if it is - necessary to group these shapes accordingly to their type (see the picture below). + necessary to group these shapes accordingly to their type: \image html group_acis.png \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_acis.png -- Export selected shape to the ACIS file via File/Export/ACIS menu. +- Export selected shape to the ACIS file via \b File - \b Export - \b ACIS menu. \image html export_acis.png diff --git a/doc/salome/gui/ACISPLUGIN/input/acisplugin_python_interface_page.doc b/doc/salome/gui/ACISPLUGIN/input/acisplugin_python_interface_page.doc index 1c251be..c233f38 100644 --- a/doc/salome/gui/ACISPLUGIN/input/acisplugin_python_interface_page.doc +++ b/doc/salome/gui/ACISPLUGIN/input/acisplugin_python_interface_page.doc @@ -5,15 +5,13 @@ Python package ACISPluginBuilder defines several functions that allow importing and exporting CAD models in ACIS format (*.sat files). -ACISPLUGIN dynamically adds several methods to the geomBuilder. +ACISPLUGIN dynamically adds these methods to the geomBuilder. Below you can see an example of usage of the ACISPluginBuilder package for import and export CAD models: \anchor example_ACISPlugin -

Example of import CAD model stored in ACIS format (*.sat files) with ACISPLUGIN:

+

Example: importing CAD model stored in ACIS format (*.sat files) with ACISPLUGIN:

\tui_script{ACISPlugindemo.py} */ - - diff --git a/doc/salome/gui/ACISPLUGIN/static/footer.html b/doc/salome/gui/ACISPLUGIN/static/footer.html old mode 100755 new mode 100644 diff --git a/doc/salome/gui/ACISPLUGIN/static/header.html.in b/doc/salome/gui/ACISPLUGIN/static/header.html.in old mode 100755 new mode 100644 diff --git a/doc/salome/gui/ACISPLUGIN/static/salome_extra.css b/doc/salome/gui/ACISPLUGIN/static/salome_extra.css index 3e8b838..802088e 100644 --- a/doc/salome/gui/ACISPLUGIN/static/salome_extra.css +++ b/doc/salome/gui/ACISPLUGIN/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/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt old mode 100755 new mode 100644 index c93b2ec..aaa6a75 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -37,7 +37,6 @@ SET(SalomeIDLACISPlugin_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/resources/SalomeApp.xml b/resources/SalomeApp.xml index c2d06d0..6ebee83 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/ACISPlugin_Engine.hxx b/src/ACISPlugin_Engine.hxx old mode 100755 new mode 100644 diff --git a/src/ACISPlugin_ExportDriver.cxx b/src/ACISPlugin_ExportDriver.cxx index 57807a7..5ce2420 100644 --- a/src/ACISPlugin_ExportDriver.cxx +++ b/src/ACISPlugin_ExportDriver.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef ACIS_HASLICENSE #include "ACISPlugin_license.h" @@ -70,7 +71,7 @@ Standard_Integer ACISPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons OCCLicense_Activate("SAT-W-"OCC_VERSION_STRING, ACIS_WRITE_LICENSE); } catch (Standard_LicenseError) { - return 1; + return 0; } #endif // ACIS_HASLICENSE diff --git a/src/ACISPlugin_GUI.cxx b/src/ACISPlugin_GUI.cxx index f36893c..4e268df 100644 --- a/src/ACISPlugin_GUI.cxx +++ b/src/ACISPlugin_GUI.cxx @@ -275,7 +275,7 @@ bool ACISPlugin_GUI::exportACIS( SUIT_Desktop* parent ) extern "C" { #ifdef WIN32 - __declspec( dllexport ) + __declspec( dllexport ) #endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { diff --git a/src/ACISPlugin_IECallBack.cxx b/src/ACISPlugin_IECallBack.cxx old mode 100755 new mode 100644 index 966b0cd..9be23eb --- a/src/ACISPlugin_IECallBack.cxx +++ b/src/ACISPlugin_IECallBack.cxx @@ -68,4 +68,3 @@ ACISPlugin_IECallBack::Import( int theDocId, ACISPlugin_IOperations* aPluginOperations = ACISPlugin_OperationsCreator::get( GetEngine(), theDocId ); return aPluginOperations->ImportACIS( theFileName ); } - diff --git a/src/ACISPlugin_ImportDriver.cxx b/src/ACISPlugin_ImportDriver.cxx index d23aad4..6f8af8a 100644 --- a/src/ACISPlugin_ImportDriver.cxx +++ b/src/ACISPlugin_ImportDriver.cxx @@ -47,6 +47,7 @@ #include #include +#include #ifdef ACIS_HASLICENSE #include "ACISPlugin_license.h" @@ -94,7 +95,7 @@ Standard_Integer ACISPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons OCCLicense_Activate( "SAT-R-"OCC_VERSION_STRING, ACIS_READ_LICENSE); } catch (Standard_LicenseError) { - return aResShape; + return 0; } #endif // ACIS_HASLICENSE diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 70cfe70..997ae52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,15 +29,16 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${ACIS_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/resources/ACISPlugin_msg_fr.ts b/src/resources/ACISPlugin_msg_fr.ts index 49a9413..77173a5 100644 --- a/src/resources/ACISPlugin_msg_fr.ts +++ b/src/resources/ACISPlugin_msg_fr.ts @@ -43,4 +43,4 @@ Importer ACIS - \ No newline at end of file + diff --git a/src/resources/ACISPlugin_msg_ja.ts b/src/resources/ACISPlugin_msg_ja.ts index e796fe9..d68a3c6 100644 --- a/src/resources/ACISPlugin_msg_ja.ts +++ b/src/resources/ACISPlugin_msg_ja.ts @@ -43,4 +43,4 @@ Import ACIS - \ No newline at end of file + -- 2.39.2