From: nds Date: Wed, 24 Feb 2016 08:41:09 +0000 (+0300) Subject: Replace NewGeom text to SHAPER X-Git-Tag: V_2.2.0~76 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d31b2834853f65576fceedcb8dd2ee8fd94d65a0;p=modules%2Fshaper.git Replace NewGeom text to SHAPER --- diff --git a/CMakeCommon/UnitTest.cmake b/CMakeCommon/UnitTest.cmake index 3685b2b2b..c7b9245a0 100644 --- a/CMakeCommon/UnitTest.cmake +++ b/CMakeCommon/UnitTest.cmake @@ -1,7 +1,7 @@ ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D # -# NewGeom unit test system +# SHAPER unit test system # How to use: # INCLUDE(UnitTest) # ... @@ -54,10 +54,10 @@ MACRO(ADD_UNIT_TESTS) COMMAND ${PYTHON_EXECUTABLE} ${aTestFileName}) if (WIN32) # different path to libraries variable name SET_TESTS_PROPERTIES(${aTestName} PROPERTIES - ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};NEW_GEOM_CONFIG_FILE=${_CONFIG_FILE}") + ENVIRONMENT "PATH=${_JUSTPATH};PYTHONPATH=${_PYTHONPATH};SHAPER_CONFIG_FILE=${_CONFIG_FILE}") else() SET_TESTS_PROPERTIES(${aTestName} PROPERTIES - ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};NEW_GEOM_CONFIG_FILE=${_CONFIG_FILE}") + ENVIRONMENT "LD_LIBRARY_PATH=${_LD_LIBRARY_PATH};PYTHONPATH=${_PYTHONPATH};SHAPER_CONFIG_FILE=${_CONFIG_FILE}") endif() # Debug output... #MESSAGE(STATUS "Test added: ${aTestName} file: ${aTestFileName}") diff --git a/README b/README index 75b6ec213..629455b99 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -NewGEOM version 2.0.0 +SHAPER version 2.0.0 Compilation on LINUX: ===================== @@ -31,7 +31,7 @@ Or without environment call: Compilation on Windows: ======================= cd - buildNewGEOM_rel.bat + buildSHAPER_rel.bat It will launch the Visual Studio 2010. In it build for: "ALL_BUILD" and then "INSTALL" projects. Launch: @@ -43,6 +43,6 @@ For compilation on Windows basing on SALOME products already installed please us msvc9_env_Salome.bat SALOME_ROOT_DIR is needed to be correctly set or located in "SALOME" folder of -parent to NewGEOM folder. For the current moment SALOME 7.3.0 compiled on +parent to SHAPER folder. For the current moment SALOME 7.3.0 compiled on Visual Studio 2008 compiler is supported. diff --git a/doc/Shaper/general_architecture.doc b/doc/Shaper/general_architecture.doc index 11bb3012e..3041bfed3 100644 --- a/doc/Shaper/general_architecture.doc +++ b/doc/Shaper/general_architecture.doc @@ -3,7 +3,7 @@ A Shaper module is made of Workshop (see XGUI_Workshop) which loads a Module (see ModuleBase_IModule), connecting its features with GUI, providing it with services for launching of operations, tools for user inputs and visualisation of results. The Module can consist of one or several plug-ins which provide implementation of Module features. Each plug-in can implement one or several features. These features can be structured by Workbenches within Workshop. Workshop provides introducing of these Workbenches within main window in form of menus or/and tool bars. \n -Workshop interacts with a Module with help of specific interface defined in ModuleBase package. Each module for NewGeom application has to implement ModuleBase_IModile interface. +Workshop interacts with a Module with help of specific interface defined in ModuleBase package. Each module for SHAPER application has to implement ModuleBase_IModile interface. \n A Module manages a one document (ModelAPI_Document). This document consists of a one root document and several, loaded by request, sub-documents. Each sub-document can be stored in a single file. \n @@ -30,11 +30,11 @@ Each sub-document contains a data of a one Part. When the user saves its session

SALOME module definition

-The NewGeom package allows to launch the application as one of the module of SALOME platform. In that case all user interface elements are integrated into SALOME platform: the \ref Salome package is used for this connection. +The SHAPERGUI package allows to launch the application as one of the module of SALOME platform. In that case all user interface elements are integrated into SALOME platform: the \ref Salome package is used for this connection. \n To integrate Shaper into SALOME the next steps are done:
    -
  1. LightApp_Module class from SALOME GUI LightApp package is redefined (see NewGeom_Module). This redefined class provides a connection between LightApp_Module interface and Workshop object of the application.
    2. +
  2. LightApp_Module class from SALOME GUI LightApp package is redefined (see SHAPERGUI). This redefined class provides a connection between LightApp_Module interface and Workshop object of the application.
  3. Provide Workshop with a SALOME mode of launching in SALOME environment. In this case it is launched without its own main window, 3d viewer and main menu.
  4. In SALOME mode workshop uses:
      @@ -48,9 +48,9 @@ To integrate Shaper into SALOME the next steps are done:
    1. Each workbench is defined as a menu in main menu bar of SALOME desktop and as a tool bar with corresponded title.
    2. Each feature in the workbench is defined as a menu item in the corresponded menu and a button in the corresponded tool bar.
      3. -
    3. Object Browser of SALOME is hidden on activation of NewGEOM and restored on its deactivation.
      4. -
    4. Object Browser and Property panel of NewGEOM is shown on activation of the module and hidden on its deactivation.
      5. -
    5. Persistent of NewGEOM is compatible with persistent of SALOME. On saving of SALOME study the content of NewGEOM data structure is saved into study also and restored on restoring of study.
      6. +
    6. Object Browser of SALOME is hidden on activation of SHAPER and restored on its deactivation.
      7. +
    7. Object Browser and Property panel of SHAPER is shown on activation of the module and hidden on its deactivation.
      8. +
    8. Persistent of SHAPER is compatible with persistent of SALOME. On saving of SALOME study the content of SHAPERM data structure is saved into study also and restored on restoring of study.
    */ diff --git a/doc/first_feature_help.doc b/doc/first_feature_help.doc index fc7f1f9eb..233e9fd3c 100644 --- a/doc/first_feature_help.doc +++ b/doc/first_feature_help.doc @@ -1,7 +1,7 @@ /*! \page first_feature_help How to create custom features or plugins -A NewGeom module consists of one or several plug-ins which provide implementation of Module features. To extend the application functionality, developers are able to add their own features into existent plugins. Also, it is possible to create a custom plugin, if necessary. +A SHAPER module consists of one or several plug-ins which provide implementation of Module features. To extend the application functionality, developers are able to add their own features into existent plugins. Also, it is possible to create a custom plugin, if necessary. \n This document describes the basic principles of plugin/feature system and shows how to use the API for writing a feature or plugin. Currently, the API is available for C++ and Python languages. Plugin, written in C++ is a shared object (dll); For Python, it is regular python module, with *.py extension. \n diff --git a/eclipse.sh b/eclipse.sh index 8603025a6..d4036fb36 100755 --- a/eclipse.sh +++ b/eclipse.sh @@ -9,7 +9,7 @@ cd ${BUILD_DIR} CMAKE_ARGS="-D_ECLIPSE_VERSION=4.3" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=ON" -CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${NEWGEOM_ROOT_DIR}" +CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}" CMAKE_ARGS="${CMAKE_ARGS} -DPYTHON_EXECUTABLE=${PYTHONHOME}/bin/python" CMAKE_ARGS="${CMAKE_ARGS} -DUSE_TEST_COVERAGE=OFF" CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}" diff --git a/env.sh b/env.sh index ab13dd393..15f527401 100644 --- a/env.sh +++ b/env.sh @@ -18,6 +18,6 @@ fi source env_config.sh # Path to solvespace-2 -export NEWGEOM_PDIR=/dn48/newgeom/common/products +export SHAPER_PDIR=/dn48/newgeom/common/products # Path to install directory -export NEWGEOM_ROOT_DIR=$(cd .. && pwd)/install +export SHAPER_ROOT_DIR=$(cd .. && pwd)/install diff --git a/env_Salome.bat b/env_Salome.bat index 0a97e7c72..2a7d7a437 100644 --- a/env_Salome.bat +++ b/env_Salome.bat @@ -99,7 +99,7 @@ IF "%ARCH%" == "Win64" ( ) ) -@SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins +@SET SHAPER_CONFIG_FILE=%ROOT_DIR%\install\plugins @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install @SET PATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\bin;%PATH% @SET PYTHONPATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\addons;%SHAPER_ROOT_DIR%\pythonAPI;%PYTHONPATH% diff --git a/env_linux.sh b/env_linux.sh index 2aaa7dbbd..0304d3338 100644 --- a/env_linux.sh +++ b/env_linux.sh @@ -3,10 +3,10 @@ # This script uses: # # INST_ROOT - path of SALOME (env_products.sh) -# NEWGEOM_PDIR - path of PRODUCTS for NEWGEOM (SolveSpace, lcov) -# NEWGEOM_ROOT_DIR - path of NEWGEOM installation +# SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov) +# SHAPER_ROOT_DIR - path of SHAPER installation -for path in INST_ROOT NEWGEOM_PDIR NEWGEOM_ROOT_DIR; do +for path in INST_ROOT SHAPER_PDIR SHAPER_ROOT_DIR; do if [[ -z ${!path+x} ]]; then echo "${path} not found."; exit 1 else @@ -20,25 +20,25 @@ source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh) set -u #------ SolveSpace ------ -export SOLVESPACE_ROOT_DIR=${NEWGEOM_PDIR}/solvespace-2.1 +export SOLVESPACE_ROOT_DIR=${SHAPER_PDIR}/solvespace-2.1 export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ## #------ PlaneGCS ------ -export PLANEGCS_ROOT_DIR=${NEWGEOM_PDIR}/planegcs-0.16 +export PLANEGCS_ROOT_DIR=${SHAPER_PDIR}/planegcs-0.16 export LD_LIBRARY_PATH=${PLANEGCS_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ## #------ Eigen ------ -export EIGEN_ROOT_DIR=${NEWGEOM_PDIR}/eigen-3.2.7 +export EIGEN_ROOT_DIR=${SHAPER_PDIR}/eigen-3.2.7 ## #------ Boost ------ -export BOOST_ROOT_DIR=${NEWGEOM_PDIR}/boost-1.52.0 +export BOOST_ROOT_DIR=${SHAPER_PDIR}/boost-1.52.0 ## #------ lcov ------ -export LCOV_ROOT_DIR=${NEWGEOM_PDIR}/lcov-1.11 +export LCOV_ROOT_DIR=${SHAPER_PDIR}/lcov-1.11 export PATH=${LCOV_ROOT_DIR}/bin:${PATH} ## @@ -51,9 +51,9 @@ export LIB=${LD_LIBRARY_PATH} export PATH=${CASROOT}:${PATH} ## -#------ NewGEOM ------ -export PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/plugins:${PATH} -export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${NEWGEOM_ROOT_DIR}/addons:${NEWGEOM_ROOT_DIR}/PythonAPI:${PYTHONPATH} -export LD_LIBRARY_PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH} -export NEW_GEOM_CONFIG_FILE=${NEWGEOM_ROOT_DIR}/plugins -export NewGeomResources=${NEWGEOM_ROOT_DIR}/resources +#------ SHAPER ------ +export PATH=${SHAPER_ROOT_DIR}/bin:${SHAPER_ROOT_DIR}/plugins:${PATH} +export PYTHONPATH=${SHAPER_ROOT_DIR}/swig:${SHAPER_ROOT_DIR}/plugins:${SHAPER_ROOT_DIR}/addons:${SHAPER_ROOT_DIR}/PythonAPI:${PYTHONPATH} +export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin:${SHAPER_ROOT_DIR}/swig:${SHAPER_ROOT_DIR}/plugins:${LD_LIBRARY_PATH} +export SHAPER_CONFIG_FILE=${SHAPER_ROOT_DIR}/plugins +export SHAPERResources=${SHAPER_ROOT_DIR}/resources diff --git a/env_salome.sh b/env_salome.sh index 7aa4b6992..631a01214 100644 --- a/env_salome.sh +++ b/env_salome.sh @@ -12,4 +12,4 @@ source ${TOOLS_DIR}/env_linux.sh # Correcting path which defined with error export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} -export SalomeAppConfig=${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui +export SalomeAppConfig=${SHAPER_ROOT_DIR}/share/salome/resources/shaper:${GUI_ROOT_DIR}/share/salome/resources/gui diff --git a/env_standalone.sh b/env_standalone.sh index d4ca856c3..e04a1e0ae 100644 --- a/env_standalone.sh +++ b/env_standalone.sh @@ -15,5 +15,5 @@ export PATH=${SUIT_DIR}/bin:${PATH} export LD_LIBRARY_PATH=${SUIT_DIR}/lib/salome:${LD_LIBRARY_PATH} #export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} -#export LightAppConfig=${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui -export LightAppConfig=${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom +#export LightAppConfig=${SHAPER_ROOT_DIR}/share/salome/resources/shaper:${GUI_ROOT_DIR}/share/salome/resources/gui +export LightAppConfig=${SHAPER_ROOT_DIR}/share/salome/resources/shaper diff --git a/linux_run.sh b/linux_run.sh index f84755c19..aad0cde3e 100755 --- a/linux_run.sh +++ b/linux_run.sh @@ -5,6 +5,6 @@ source ${TOOLS_DIR}/env_standalone.sh ${TOOLS_DIR}/solver.sh "$@" -APP=${NEWGEOM_ROOT_DIR}/bin/GeomApp +APP=${SHAPER_ROOT_DIR}/bin/GeomApp ${APP} diff --git a/make.sh b/make.sh index 491d8f394..2ebe12011 100755 --- a/make.sh +++ b/make.sh @@ -34,7 +34,7 @@ fi CMAKE_ARGS="" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}" CMAKE_ARGS="${CMAKE_ARGS} -DUSE_TEST_COVERAGE=${USE_TEST_COVERAGE:-OFF}" -CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${NEWGEOM_ROOT_DIR}" +CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}" CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}" mkdir -p ${BUILD_DIR} diff --git a/msvc10_env.bat b/msvc10_env.bat index aaa3a32c1..8d8aa6eb8 100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@ -173,7 +173,7 @@ set PATH=%CMAKEDIR%\bin;%PATH% @REM ------------------------- @REM OPENPARTS @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install -@SET NEW_GEOM_CONFIG_FILE=%SHAPER_ROOT_DIR%\plugins +@SET SHAPER_CONFIG_FILE=%SHAPER_ROOT_DIR%\plugins @SET PATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\bin;%PATH% @SET PYTHONPATH=%SHAPER_ROOT_DIR%\swig;%SHAPER_ROOT_DIR%\plugins;%SHAPER_ROOT_DIR%\addons;%SHAPER_ROOT_DIR%\pythonAPI;%PYTHONPATH% @SET SHAPERResources=%SHAPER_ROOT_DIR%\resources diff --git a/solver.sh b/solver.sh index fb002a6af..2e6ed445e 100755 --- a/solver.sh +++ b/solver.sh @@ -2,7 +2,7 @@ # # Modify plugins.xml to switch solver -export PLUGINS_PATH=${PLUGINS_PATH:-${NEWGEOM_ROOT_DIR}/plugins/plugins.xml} +export PLUGINS_PATH=${PLUGINS_PATH:-${SHAPER_ROOT_DIR}/plugins/plugins.xml} while [[ $# > 0 ]]; do key="$1" diff --git a/src/Config/Config_Keywords.h b/src/Config/Config_Keywords.h index 609d7907a..e26ba0aa4 100644 --- a/src/Config/Config_Keywords.h +++ b/src/Config/Config_Keywords.h @@ -99,9 +99,6 @@ const static char* PLUGIN_LIBRARY = "library"; const static char* PLUGIN_SCRIPT = "script"; const static char* PLUGIN_DEPENDENCY = "dependency"; -const static char* PLUGIN_PLATFORM_SALOME = "salome"; -const static char* PLUGIN_PLATFORM_NEWGEOM = "openparts"; - /* * Hardcoded xml entities of dataModel.xml */ diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp index b6bbc0ecc..a995f3c71 100644 --- a/src/Config/Config_XMLReader.cpp +++ b/src/Config/Config_XMLReader.cpp @@ -41,7 +41,7 @@ Config_XMLReader::Config_XMLReader(const std::string& theXmlFileName) * to use environment variable (at least for the current moment) */ if (prefix.empty()) { - char* anEnv = getenv("NEW_GEOM_CONFIG_FILE"); + char* anEnv = getenv("SHAPER_CONFIG_FILE"); if (anEnv) { prefix = std::string(anEnv); } diff --git a/src/Model/Model_AttributeSelection.h b/src/Model/Model_AttributeSelection.h index 665758341..5c7d3c358 100644 --- a/src/Model/Model_AttributeSelection.h +++ b/src/Model/Model_AttributeSelection.h @@ -54,7 +54,7 @@ public: /// Returns an Id of the selection /// NOTE: This method has been added for temporary export of groups towards old GEOM - /// It should then be removed when a direct use of objects from NewGeom + /// It should then be removed when a direct use of objects from SHAPER /// will be possible from SMESH module of SALOME. MODEL_EXPORT virtual int Id(); diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp index bc7864833..03aec786b 100644 --- a/src/ModuleBase/ModuleBase_Preferences.cpp +++ b/src/ModuleBase/ModuleBase_Preferences.cpp @@ -26,7 +26,7 @@ SUIT_ResourceMgr* ModuleBase_Preferences::myResourceMgr = 0; SUIT_ResourceMgr* ModuleBase_Preferences::resourceMgr() { if (!myResourceMgr) { - myResourceMgr = new SUIT_ResourceMgr("NewGeom"); + myResourceMgr = new SUIT_ResourceMgr("SHAPER"); myResourceMgr->setCurrentFormat("xml"); } return myResourceMgr; diff --git a/src/ModuleBase/ModuleBase_Preferences.h b/src/ModuleBase/ModuleBase_Preferences.h index c3f31b76e..cae9af663 100644 --- a/src/ModuleBase/ModuleBase_Preferences.h +++ b/src/ModuleBase/ModuleBase_Preferences.h @@ -42,7 +42,7 @@ class MODULEBASE_EXPORT ModuleBase_Preferences static SUIT_ResourceMgr* resourceMgr(); /// Sets a resource manager - /// It is used in case of necessity to define external resource manager (not NewGeom) + /// It is used in case of necessity to define external resource manager (not SHAPER) /// \param theMgr resource manager static void setResourceMgr(SUIT_ResourceMgr* theMgr) { myResourceMgr = theMgr; } diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt index c8616d383..e21ab2206 100644 --- a/src/SHAPERGUI/CMakeLists.txt +++ b/src/SHAPERGUI/CMakeLists.txt @@ -27,7 +27,7 @@ SET(PROJECT_SOURCES SET(PROJECT_RESOURCES resources/LightApp.xml resources/SalomeApp.xml - resources/newgeom.png + resources/shaper.png ) SET(PROJECT_LIBRARIES @@ -58,15 +58,15 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI ${CAS_INCLUDE_DIRS} ) -ADD_LIBRARY(SHAPERGUI SHARED +ADD_LIBRARY(SHAPER SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ) -ADD_DEPENDENCIES(SHAPERGUI XGUI) +ADD_DEPENDENCIES(SHAPER XGUI) # The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore -TARGET_LINK_LIBRARIES(SHAPERGUI ${PROJECT_LIBRARIES}) +TARGET_LINK_LIBRARIES(SHAPER ${PROJECT_LIBRARIES}) -INSTALL(TARGETS SHAPERGUI DESTINATION bin) +INSTALL(TARGETS SHAPER DESTINATION bin) INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/shaper ) diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp index 5c0a2833a..7bf260cdb 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -96,7 +96,7 @@ private: //****************************************************** SHAPERGUI::SHAPERGUI() - : LightApp_Module("NewGeom"), + : LightApp_Module("SHAPER"), mySelector(0), myIsOpened(0), myPopupMgr(0) { myWorkshop = new XGUI_Workshop(this); @@ -146,7 +146,7 @@ void SHAPERGUI::connectToStudy(CAM_Study* theStudy) // if there are created viewer managers, we should try to create viewer // selector and initialize viewer with it. It sets interactive contect to the // proxy viewer. If study is opened, CAM application calls this method before the open() of data model - // the NewGeom data model is specific and during open(load) redisplay signals are flushed, so + // the SHAPER data model is specific and during open(load) redisplay signals are flushed, so // we need to connect to the viewer before it. Here, it seems the most appropriate place for this // according to SALOME architecture. if (!mySelector) { diff --git a/src/SHAPERGUI/SHAPERGUI.h b/src/SHAPERGUI/SHAPERGUI.h index eb993b0c7..7efea881a 100644 --- a/src/SHAPERGUI/SHAPERGUI.h +++ b/src/SHAPERGUI/SHAPERGUI.h @@ -114,10 +114,10 @@ Q_OBJECT return myProxyViewer; } - //! Returns list of defined actions (just by NewGeom module) + //! Returns list of defined actions (just by SHAPER module) virtual QList commandList() const; - //! Returns list of Ids of defined actions (just by NewGeom module) + //! Returns list of Ids of defined actions (just by SHAPER module) virtual QStringList commandIdList() const; /// Redefinition of virtual function. diff --git a/src/SHAPERGUI/SHAPERGUI_DataModel.cpp b/src/SHAPERGUI/SHAPERGUI_DataModel.cpp index 2aa2ef034..df6a6ae3f 100644 --- a/src/SHAPERGUI/SHAPERGUI_DataModel.cpp +++ b/src/SHAPERGUI/SHAPERGUI_DataModel.cpp @@ -36,7 +36,7 @@ bool SHAPERGUI_DataModel::open(const QString& thePath, CAM_Study* theStudy, QStr // If the file is Multi(contain all module files inside), the open SALOME functionality creates // these files in a temporary directory. After the open functionality is finished, it removes // these files (in the full SALOME mode). - // The postponed loading of the files is realized in the NewGEOM module. So, it is important do + // The postponed loading of the files is realized in the SHAPER module. So, it is important do // not remove the opened files. // The following code creates a new tmp directory with a copy of files. QString aTmpDir = theFiles.first(); diff --git a/src/SHAPERGUI/SHAPERGUI_DataModel.h b/src/SHAPERGUI/SHAPERGUI_DataModel.h index f07b913bf..2383f832b 100644 --- a/src/SHAPERGUI/SHAPERGUI_DataModel.h +++ b/src/SHAPERGUI/SHAPERGUI_DataModel.h @@ -1,8 +1,8 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -#ifndef NEWGEOM_DATAMODEL_H -#define NEWGEOM_DATAMODEL_H +#ifndef SHAPERGUI_DATAMODEL_H +#define SHAPERGUI_DATAMODEL_H #include "SHAPER_SHAPERGUI.h" #include diff --git a/src/SHAPERGUI/SHAPERGUI_NestedButton.h b/src/SHAPERGUI/SHAPERGUI_NestedButton.h index bb2bb7cb4..2b55ee376 100644 --- a/src/SHAPERGUI/SHAPERGUI_NestedButton.h +++ b/src/SHAPERGUI/SHAPERGUI_NestedButton.h @@ -5,8 +5,8 @@ * Author: sbh */ -#ifndef SRC_NEWGEOM_NEWGEOM_NESTEDBUTTON_H_ -#define SRC_NEWGEOM_NEWGEOM_NESTEDBUTTON_H_ +#ifndef SRC_SHAPERGUI_NESTEDBUTTON_H_ +#define SRC_SHAPERGUI_NESTEDBUTTON_H_ #include @@ -50,4 +50,4 @@ class SHAPERGUI_NestedButton : public QWidgetAction QToolButton* myThisButton; ///< main button }; -#endif /* SRC_NEWGEOM_NEWGEOM_NESTEDBUTTON_H_ */ +#endif /* SRC_SHAPERGUI_NESTEDBUTTON_H_ */ diff --git a/src/SHAPERGUI/SHAPERGUI_OCCSelector.h b/src/SHAPERGUI/SHAPERGUI_OCCSelector.h index 9d9e44e31..3ee36b4ce 100644 --- a/src/SHAPERGUI/SHAPERGUI_OCCSelector.h +++ b/src/SHAPERGUI/SHAPERGUI_OCCSelector.h @@ -9,7 +9,7 @@ /** * \ingroup Salome -* Redefinition of standard OCC selector in order to adapt it to NewGeom needs +* Redefinition of standard OCC selector in order to adapt it to SHAPER needs */ class SHAPERGUI_EXPORT SHAPERGUI_OCCSelector : public LightApp_OCCSelector { diff --git a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp index b4a65ead8..e31903dc4 100644 --- a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp +++ b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp @@ -314,7 +314,7 @@ bool SHAPERGUI_SalomeViewer::enableDrawMode(bool isEnabled) //********************************************** void SHAPERGUI_SalomeViewer::reconnectActions(SUIT_ViewWindow* theWindow, - const bool theUseNewGeomSlot) + const bool theUseSHAPERSlot) { OCCViewer_ViewWindow* aWindow = dynamic_cast(theWindow); if (!aWindow) @@ -324,7 +324,7 @@ void SHAPERGUI_SalomeViewer::reconnectActions(SUIT_ViewWindow* theWindow, if (!anAction) return; - if (theUseNewGeomSlot) { + if (theUseSHAPERSlot) { anAction->disconnect(anAction, SIGNAL(toggled(bool)), theWindow, SLOT(onTrihedronShow(bool))); anAction->connect(anAction, SIGNAL(toggled(bool)), diff --git a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.h b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.h index 3e34b603a..e97c3e10b 100644 --- a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.h +++ b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.h @@ -24,7 +24,7 @@ class SUIT_ViewManager; /** * \ingroup Salome -* A class for providing access of NewGeom functionality to +* A class for providing access of SHAPERGUI functionality to * SALOME view window functionality */ class SHAPERGUI_SalomeView: public ModuleBase_IViewWindow @@ -58,7 +58,7 @@ private: /** * \ingroup Salome -* A class for providing access of NewGeom functionality to +* A class for providing access of SHAPERGUI functionality to * SALOME viewer functionality */ class SHAPERGUI_SalomeViewer : public ModuleBase_IViewer @@ -102,7 +102,7 @@ Q_OBJECT virtual bool enableDrawMode(bool isEnabled); //! For some signals it disconnects the window from usual signal and connect it to the module ones - void reconnectActions(SUIT_ViewWindow* theWindow, const bool theUseNewGeomSlot); + void reconnectActions(SUIT_ViewWindow* theWindow, const bool theUseSHAPERSlot); //! Perfroms the fit all for the active view virtual void fitAll(); diff --git a/src/SHAPERGUI/resources/LightApp.xml b/src/SHAPERGUI/resources/LightApp.xml index 35f5954da..4fc4cc72a 100644 --- a/src/SHAPERGUI/resources/LightApp.xml +++ b/src/SHAPERGUI/resources/LightApp.xml @@ -19,19 +19,20 @@ --> -
    +
    - - + + - +
    -
    +
    - + +
    - +
    diff --git a/src/SHAPERGUI/resources/SalomeApp.xml b/src/SHAPERGUI/resources/SalomeApp.xml index 0df9ffd62..cef46113b 100644 --- a/src/SHAPERGUI/resources/SalomeApp.xml +++ b/src/SHAPERGUI/resources/SalomeApp.xml @@ -21,21 +21,23 @@
    - +
    -
    +
    - - + + - +
    -
    +
    - + + +
    - +
    diff --git a/src/SHAPERGUI/resources/newgeom.png b/src/SHAPERGUI/resources/newgeom.png deleted file mode 100644 index d4827e272..000000000 Binary files a/src/SHAPERGUI/resources/newgeom.png and /dev/null differ diff --git a/src/SHAPERGUI/resources/shaper.png b/src/SHAPERGUI/resources/shaper.png new file mode 100644 index 000000000..d4827e272 Binary files /dev/null and b/src/SHAPERGUI/resources/shaper.png differ diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index 81e1f44fa..d2daecc45 100644 --- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp +++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp @@ -271,7 +271,7 @@ Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon() return myIconsMap[iconName()]; } // Load icon for the presentation - char* aEnv = getenv("NEWGEOM_ROOT_DIR"); + char* aEnv = getenv("SHAPER_ROOT_DIR"); if (aEnv != NULL) { TCollection_AsciiString aFile(aEnv); aFile+=FSEP; diff --git a/src/XGUI/XGUI_SalomeConnector.h b/src/XGUI/XGUI_SalomeConnector.h index 50c622f01..ac2c60f40 100644 --- a/src/XGUI/XGUI_SalomeConnector.h +++ b/src/XGUI/XGUI_SalomeConnector.h @@ -93,7 +93,7 @@ class XGUI_EXPORT XGUI_SalomeConnector //! Returns QAction instance by command string Id virtual QAction* command(const QString& theId) const = 0; - //! Returns list of defined actions (just by NewGeom module) + //! Returns list of defined actions (just by SHAPER module) virtual QList commandList() const = 0; //! Returns list of Ids of defined actions (just by NewGeom module) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 3101617b6..57928b4b8 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -300,12 +300,12 @@ void XGUI_Workshop::initMenu() //connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild())); //salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT"); - aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export NewGeom..."), tr("Export the current document into a NewGeom file"), + aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export native..."), tr("Export the current document into a native file"), QIcon(), QKeySequence(), false, "MEN_DESK_FILE"); connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs())); - aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import NewGeom..."), tr("Import a NewGeom file"), + aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."), tr("Import native file"), QIcon(), QKeySequence(), false, "MEN_DESK_FILE"); connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen())); @@ -1128,7 +1128,7 @@ void XGUI_Workshop::hidePropertyPanel() // in SALOME mode, workstack made the PyConsole the active window, // set the focus on it. As a result, shortcuts of the application, like // are processed by this console. For example Undo actions. - // It is possible that this code is to be moved to NewGeom package + // It is possible that this code is to be moved to SHAPER package QMainWindow* aDesktop = desktop(); ModuleBase_Tools::activateWindow(aDesktop, "XGUI_Workshop::hidePropertyPanel()"); ModuleBase_Tools::setFocus(aDesktop, "XGUI_Workshop::showPropertyPanel()");