From c4770260eed7671bce9e7abd6d9734f67a020b80 Mon Sep 17 00:00:00 2001 From: vsv Date: Mon, 5 Aug 2019 16:01:12 +0300 Subject: [PATCH] Change name of standalone application from OpenParts to CADBuilder --- CMakeLists.txt | 4 ++-- doc/tui/CMakeLists.txt | 2 +- doc/tui/Modules.doc | 2 +- doc/tui/OpenParts/general_architecture.doc | 14 +++++++------- src/Config/Config_XMLReader.cpp | 10 +++++----- src/ModuleBase/ModuleBase_Tools.cpp | 2 +- src/SketcherPrs/SketcherPrs_SymbolPrs.cpp | 2 +- src/XGUI/XGUI_Workshop.cpp | 6 +++--- src/XGUI/XGUI_Workshop.h | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed5ca2bfb..dfc3a0edb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,9 @@ SET (SHAPER_Version 9.3.0) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) -IF (NOT OPENPARTS_BUILD_DOC) +IF (NOT CADBUILDER_BUILD_DOC) OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON) -ENDIF(OPENPARTS_BUILD_DOC) +ENDIF(NOT CADBUILDER_BUILD_DOC) INCLUDE(SalomeMacros) diff --git a/doc/tui/CMakeLists.txt b/doc/tui/CMakeLists.txt index ef4995e03..6b4d118a0 100644 --- a/doc/tui/CMakeLists.txt +++ b/doc/tui/CMakeLists.txt @@ -24,7 +24,7 @@ ELSE (WIN32) ENDIF(WIN32) IF(HAVE_SALOME) - SET(EXCLUDE_DOC_DIR "*/AppElements/* */OpenParts/*") + SET(EXCLUDE_DOC_DIR "*/AppElements/* */CADBuilder/*") ELSE(HAVE_SALOME) SET(EXCLUDE_DOC_DIR "*/Shaper/*") ENDIF(HAVE_SALOME) diff --git a/doc/tui/Modules.doc b/doc/tui/Modules.doc index 4c6f43c2c..451a13f4c 100644 --- a/doc/tui/Modules.doc +++ b/doc/tui/Modules.doc @@ -68,7 +68,7 @@ * \defgroup Salome A Salome connector * * \brief A set of classes which provide wrapping of - * OpenParts application as SALOME module + * CAD Builder application as SALOME module */ /** diff --git a/doc/tui/OpenParts/general_architecture.doc b/doc/tui/OpenParts/general_architecture.doc index cdd68f362..940f920aa 100644 --- a/doc/tui/OpenParts/general_architecture.doc +++ b/doc/tui/OpenParts/general_architecture.doc @@ -1,22 +1,22 @@ /*! \page general_architecture General Architecture -OpenPARTS 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. +CAD Builder 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 OpenPARTS application has to implement ModuleBase_IModile interface. +Workshop interacts with a Module with help of specific interface defined in ModuleBase package. Each module for CAD Builder 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 -Main features of the general architecture of OpenPARTS: +Main features of the general architecture of CAD Builder: \n\n @@ -24,8 +24,8 @@ A Module manages a one document (ModelAPI_Document). This document consists of a \n\n Feature is a peace of code which performs an operation. The Feature is a main component of a plug-in. It consists of input attributes, operation functionality and result objects (one or several). All features are defined in plug-ins by the specific feature developer (in C++ or python). \n -For today there is a one implementation of OpenPARTS application which implements Part Set functionality (PartSet_Module). -The geometric model (i.e. the whole geometry produce by PartSet) is created through operations, or features (ModelAPI_Feature), which define a meaningful piece of design (see \ref Plugins group). In order to easily create dedicated variants of the modeler, also to gradually develop OpenPARTS, each feature is implemented in a Plug-in (ModelAPI_Plugin, a piece of application including its own GUI, built separately from the application. It is loaded dynamically to the application). In other words, a Module is made of a collection of Plug-ins. +For today there is a one implementation of CAD Builder application which implements Part Set functionality (PartSet_Module). +The geometric model (i.e. the whole geometry produce by PartSet) is created through operations, or features (ModelAPI_Feature), which define a meaningful piece of design (see \ref Plugins group). In order to easily create dedicated variants of the modeler, also to gradually develop CAD Builder, each feature is implemented in a Plug-in (ModelAPI_Plugin, a piece of application including its own GUI, built separately from the application. It is loaded dynamically to the application). In other words, a Module is made of a collection of Plug-ins. Each sub-document contains a data of a one Part. When the user saves its session, all documents are saved: the PartSet and each Part. \n diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp index a47496eb8..b98f07250 100644 --- a/src/Config/Config_XMLReader.cpp +++ b/src/Config/Config_XMLReader.cpp @@ -71,7 +71,7 @@ std::string Config_XMLReader::resourcesConfigFile() aValue = std::string(anEnv) + FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper"; } else { - anEnv = getenv("OPENPARTS_ROOT_DIR"); + anEnv = getenv("CADBUILDER_ROOT_DIR"); if (anEnv) { aValue = std::string(anEnv) + FSEP + "resources"; } @@ -87,7 +87,7 @@ std::string Config_XMLReader::pluginConfigFile() aValue = std::string(anEnv) + FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper"; } else { - anEnv = getenv("OPENPARTS_ROOT_DIR"); + anEnv = getenv("CADBUILDER_ROOT_DIR"); if (anEnv) { aValue = std::string(anEnv) + FSEP + "plugins"; } @@ -111,9 +111,9 @@ std::string Config_XMLReader::findConfigFile(const std::string theFileName, cons if (aSolution == 1) anEnvName<<"SHAPER_ROOT_DIR"; else if (aSolution == 2) - anEnvName<<"OPENPARTS_ROOT_DIR"; + anEnvName<<"CADBUILDER_ROOT_DIR"; else - anEnvName<<"OPENPARTS_PLUGINS_DIR"; + anEnvName<<"CADBUILDER_ROOT_DIR"; char* anEnv = getenv(anEnvName.str().c_str()); if (!anEnv) @@ -151,7 +151,7 @@ std::string Config_XMLReader::findConfigFile(const std::string theFileName, cons if (aResultIndex == theFindIndex) return aFileName; aResultIndex++; - if (aSolution == 1) // don't allow SHAPER and OpenParts paths treated simultaneously + if (aSolution == 1) // don't allow SHAPER and CADBuilder paths treated simultaneously aSolution++; } } diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp index 3d47d3cde..b528344ce 100644 --- a/src/ModuleBase/ModuleBase_Tools.cpp +++ b/src/ModuleBase/ModuleBase_Tools.cpp @@ -1130,7 +1130,7 @@ void setPointBallHighlighting(AIS_Shape* theAIS) aFile = std::string(anEnv) + FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper"; } else { - anEnv = getenv("OPENPARTS_ROOT_DIR"); + anEnv = getenv("CADBUILDER_ROOT_DIR"); if (anEnv) aFile = std::string(anEnv) + FSEP + "resources"; } diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index 48f851972..d23827aa7 100644 --- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp +++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp @@ -168,7 +168,7 @@ Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon() aFile = std::string(anEnv) + FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper"; } else { - anEnv = getenv("OPENPARTS_ROOT_DIR"); + anEnv = getenv("CADBUILDER_ROOT_DIR"); if (anEnv) aFile = std::string(anEnv) + FSEP + "resources"; } diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index c3378cb70..d10ccc612 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -178,8 +178,8 @@ static QString MyFilter(QObject::tr("SHAPER files (*.shaper *.opp)")); static QString MyFilter2(QObject::tr("SHAPER files (*.shaper)")); static QString MyExtension(".shaper"); #else -static QString MyFilter(QObject::tr("OpenParts files (*.opp);;All files (*.*)")); -static QString MyFilter2(QObject::tr("OpenParts files (*.opp)")); +static QString MyFilter(QObject::tr("CAD Builder files (*.opp);;All files (*.*)")); +static QString MyFilter2(QObject::tr("CAD Builder files (*.opp)")); static QString MyExtension(".opp"); #endif @@ -624,7 +624,7 @@ void XGUI_Workshop::onHelpActionClicked() "salome" + aSep + "gui" + aSep + "SHAPER"; } #else - QString aDir(getenv("OPENPARTS_ROOT_DIR")); + QString aDir(getenv("CADBUILDER_ROOT_DIR")); aDocDir = aDir + aSep + "doc" + aSep + "gui"; #endif QString aFileName = aDocDir + aSep + aHelpPage; diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h index e24c7d599..982758244 100644 --- a/src/XGUI/XGUI_Workshop.h +++ b/src/XGUI/XGUI_Workshop.h @@ -504,7 +504,7 @@ private: void createDockWidgets(); /// Extends undo/redo toolbutton's with history menu - /// \param theObject - in the OpenParts it is a QToolButton by itself, + /// \param theObject - in the CADBuilder it is a QToolButton by itself, /// in salome mode - QAction that creates a button. /// \param theSignal - void "updateUndoHistory" or "updateRedoHistory" SIGNAL; /// \param theSlot - onUndo(int) or onRedo(int) SLOT -- 2.39.2