## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
#
-# NewGeom unit test system
+# SHAPER unit test system
# How to use:
# INCLUDE(UnitTest)
# ...
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}")
-NewGEOM version 2.0.0
+SHAPER version 2.0.0
Compilation on LINUX:
=====================
Compilation on Windows:
=======================
cd <sources_directory>
- buildNewGEOM_rel.bat
+ buildSHAPER_rel.bat
It will launch the Visual Studio 2010. In it build for: "ALL_BUILD" and then "INSTALL" projects.
Launch:
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.
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
<h2>SALOME module definition</h2>
-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:
<ol>
-<li> 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.</li>
+<li> 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.</li>
<li>Provide Workshop with a <i>SALOME</i> mode of launching in SALOME environment. In this case it is launched without its own main window, 3d viewer and main menu.</li>
<li>In <i>SALOME</i> mode workshop uses:
<ol>
</li>
<li>Each workbench is defined as a menu in main menu bar of SALOME desktop and as a tool bar with corresponded title.</li>
<li>Each feature in the workbench is defined as a menu item in the corresponded menu and a button in the corresponded tool bar.</li>
-<li>Object Browser of SALOME is hidden on activation of NewGEOM and restored on its deactivation.</li>
-<li>Object Browser and Property panel of NewGEOM is shown on activation of the module and hidden on its deactivation.</li>
-<li>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.</li>
+<li>Object Browser of SALOME is hidden on activation of SHAPER and restored on its deactivation.</li>
+<li>Object Browser and Property panel of SHAPER is shown on activation of the module and hidden on its deactivation.</li>
+<li>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.</li>
</ol>
*/
/*!
\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
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}"
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
)
)
-@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%
# 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
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}
##
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
# 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
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
${TOOLS_DIR}/solver.sh "$@"
-APP=${NEWGEOM_ROOT_DIR}/bin/GeomApp
+APP=${SHAPER_ROOT_DIR}/bin/GeomApp
${APP}
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}
@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
#
# 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"
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
*/
* 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);
}
/// 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();
SUIT_ResourceMgr* ModuleBase_Preferences::resourceMgr()
{
if (!myResourceMgr) {
- myResourceMgr = new SUIT_ResourceMgr("NewGeom");
+ myResourceMgr = new SUIT_ResourceMgr("SHAPER");
myResourceMgr->setCurrentFormat("xml");
}
return myResourceMgr;
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; }
SET(PROJECT_RESOURCES
resources/LightApp.xml
resources/SalomeApp.xml
- resources/newgeom.png
+ resources/shaper.png
)
SET(PROJECT_LIBRARIES
${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 )
//******************************************************
SHAPERGUI::SHAPERGUI()
- : LightApp_Module("NewGeom"),
+ : LightApp_Module("SHAPER"),
mySelector(0), myIsOpened(0), myPopupMgr(0)
{
myWorkshop = new XGUI_Workshop(this);
// 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) {
return myProxyViewer;
}
- //! Returns list of defined actions (just by NewGeom module)
+ //! Returns list of defined actions (just by SHAPER module)
virtual QList<QAction*> 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.
// 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();
// 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 <LightApp_DataModel.h>
* 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 <QWidgetAction>
QToolButton* myThisButton; ///< main button
};
-#endif /* SRC_NEWGEOM_NEWGEOM_NESTEDBUTTON_H_ */
+#endif /* SRC_SHAPERGUI_NESTEDBUTTON_H_ */
/**
* \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
{
//**********************************************
void SHAPERGUI_SalomeViewer::reconnectActions(SUIT_ViewWindow* theWindow,
- const bool theUseNewGeomSlot)
+ const bool theUseSHAPERSlot)
{
OCCViewer_ViewWindow* aWindow = dynamic_cast<OCCViewer_ViewWindow*>(theWindow);
if (!aWindow)
if (!anAction)
return;
- if (theUseNewGeomSlot) {
+ if (theUseSHAPERSlot) {
anAction->disconnect(anAction, SIGNAL(toggled(bool)),
theWindow, SLOT(onTrihedronShow(bool)));
anAction->connect(anAction, SIGNAL(toggled(bool)),
/**
* \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
/**
* \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
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();
-->
<document>
- <section name="NewGeom">
+ <section name="SHAPER">
<!-- Major module parameters -->
- <parameter name="name" value="NewGeom"/>
- <parameter name="icon" value="newgeom.png"/>
+ <parameter name="name" value="Shaper"/>
+ <parameter name="icon" value="shaper.png"/>
<parameter name="version" value="2.1.2"/>
- <parameter name="documentation" value="newgeom_help"/>
+ <parameter name="documentation" value="shaper_help"/>
</section>
- <section name="newgeom_help" >
+ <section name="shaper_help" >
<parameter name="sub_menu" value="%1 module"/>
- <parameter name="Developer's Guide" value="%${NEWGEOM_ROOT_DIR}/doc/tui/index.html"/>
+ <parameter name="Developer's Guide" value="%SHAPER_ROOT_DIR%/share/doc/salome/tui/SHAPER/index.html"/>
+ <parameter name="User's Guide" value="%SHAPER_ROOT_DIR%/share/doc/salome/gui/SHAPER/index.html"/>
</section>
<section name="resources">
<!-- Module resources -->
- <parameter name="NewGeom" value="${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom"/>
+ <parameter name="SHAPER" value="${SHAPER_ROOT_DIR}/share/salome/resources/shaper"/>
</section>
</document>
<document>
<section name="launch">
<!-- SALOME launching parameters -->
- <parameter name="modules" value="GEOM,SMESH,HEXABLOCK,MED,YACS,PARAVIS,NewGeom"/>
+ <parameter name="modules" value="GEOM,SMESH,HEXABLOCK,MED,YACS,PARAVIS,SHAPER"/>
</section>
- <section name="NewGeom">
+ <section name="SHAPER">
<!-- Major module parameters -->
- <parameter name="name" value="NewGeom"/>
- <parameter name="icon" value="newgeom.png"/>
+ <parameter name="name" value="Shaper"/>
+ <parameter name="icon" value="shaper.png"/>
<parameter name="version" value="2.1.2"/>
- <parameter name="documentation" value="newgeom_help"/>
+ <parameter name="documentation" value="shaper_help"/>
</section>
- <section name="newgeom_help" >
+ <section name="shaper_help" >
<parameter name="sub_menu" value="%1 module"/>
- <parameter name="Developer's Guide" value="%${NEWGEOM_ROOT_DIR}/doc/tui/index.html"/>
+ <parameter name="Developer's Guide" value="%SHAPER_ROOT_DIR%/share/doc/salome/tui/SHAPER/index.html"/>
+ <parameter name="User's Guide" value="%SHAPER_ROOT_DIR%/share/doc/salome/gui/SHAPER/index.html"/>
+
</section>
<section name="resources">
<!-- Module resources -->
- <parameter name="NewGeom" value="${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom"/>
+ <parameter name="SHAPER" value="${SHAPER_ROOT_DIR}/share/salome/resources/shaper"/>
</section>
</document>
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;
//! 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<QAction*> commandList() const = 0;
//! Returns list of Ids of defined actions (just by NewGeom module)
//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()));
// 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()");
