From a9bdd72e4748283ea455fef89e11eb0eae3b7b48 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 24 Feb 2016 10:09:35 +0300 Subject: [PATCH] Rename NewGeom_* into SHAPERGUI_* --- CMakeLists.txt | 6 +-- build_Salome_deb.bat | 2 +- build_Salome_eclipse.bat | 4 +- build_Salome_rel.bat | 2 +- doc/doxyfile.in | 2 +- env_Salome.bat | 10 ++--- msvc10_env.bat | 10 ++--- salomeRun.bat | 4 +- src/{NewGeom => SHAPERGUI}/CMakeLists.txt | 36 +++++++++--------- .../SHAPERGUI.cpp} | 0 .../SHAPERGUI.h} | 0 .../SHAPERGUI_DataModel.cpp} | 0 .../SHAPERGUI_DataModel.h} | 0 .../SHAPERGUI_NestedButton.cpp} | 0 .../SHAPERGUI_NestedButton.h} | 0 .../SHAPERGUI_OCCSelector.cpp} | 0 .../SHAPERGUI_OCCSelector.h} | 0 .../SHAPERGUI_SalomeViewer.cpp} | 0 .../SHAPERGUI_SalomeViewer.h} | 0 .../SHAPER_SHAPERGUI.h} | 0 .../resources/LightApp.xml | 0 .../resources/SalomeApp.xml | 0 .../resources/newgeom.png | Bin src/XGUI/CMakeLists.txt | 2 +- src/XGUI/{NewGeom.xml => SHAPER.xml} | 0 25 files changed, 39 insertions(+), 39 deletions(-) rename src/{NewGeom => SHAPERGUI}/CMakeLists.txt (63%) rename src/{NewGeom/NewGeom_Module.cpp => SHAPERGUI/SHAPERGUI.cpp} (100%) rename src/{NewGeom/NewGeom_Module.h => SHAPERGUI/SHAPERGUI.h} (100%) rename src/{NewGeom/NewGeom_DataModel.cpp => SHAPERGUI/SHAPERGUI_DataModel.cpp} (100%) rename src/{NewGeom/NewGeom_DataModel.h => SHAPERGUI/SHAPERGUI_DataModel.h} (100%) rename src/{NewGeom/NewGeom_NestedButton.cpp => SHAPERGUI/SHAPERGUI_NestedButton.cpp} (100%) rename src/{NewGeom/NewGeom_NestedButton.h => SHAPERGUI/SHAPERGUI_NestedButton.h} (100%) rename src/{NewGeom/NewGeom_OCCSelector.cpp => SHAPERGUI/SHAPERGUI_OCCSelector.cpp} (100%) rename src/{NewGeom/NewGeom_OCCSelector.h => SHAPERGUI/SHAPERGUI_OCCSelector.h} (100%) rename src/{NewGeom/NewGeom_SalomeViewer.cpp => SHAPERGUI/SHAPERGUI_SalomeViewer.cpp} (100%) rename src/{NewGeom/NewGeom_SalomeViewer.h => SHAPERGUI/SHAPERGUI_SalomeViewer.h} (100%) rename src/{NewGeom/NewGeom.h => SHAPERGUI/SHAPER_SHAPERGUI.h} (100%) rename src/{NewGeom => SHAPERGUI}/resources/LightApp.xml (100%) rename src/{NewGeom => SHAPERGUI}/resources/SalomeApp.xml (100%) rename src/{NewGeom => SHAPERGUI}/resources/newgeom.png (100%) rename src/XGUI/{NewGeom.xml => SHAPER.xml} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32b2f6506..a3aaaf287 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) -PROJECT (NewGEOM) -SET (NewGeom_Version 2.1.2) +PROJECT (SHAPER) +SET (SHAPER_Version 2.1.2) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) @@ -68,7 +68,7 @@ ADD_SUBDIRECTORY (src/PythonAddons) ADD_SUBDIRECTORY (src/PythonAPI) IF(${HAVE_SALOME}) - ADD_SUBDIRECTORY (src/NewGeom) + ADD_SUBDIRECTORY (src/SHAPERGUI) ADD_SUBDIRECTORY (src/ConnectorPlugin) ENDIF(${HAVE_SALOME}) diff --git a/build_Salome_deb.bat b/build_Salome_deb.bat index 77a58f1ed..fe8ac9a65 100644 --- a/build_Salome_deb.bat +++ b/build_Salome_deb.bat @@ -16,4 +16,4 @@ cd %ROOT_DIR%\build cmake %SRC_DIR% -G "Visual Studio 10" -DPYTHON_EXECUTABLE=%PYTHONHOME%\python_d.exe -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install -start "" %MSVC_EXE% NewGEOM.sln +start "" %MSVC_EXE% SHAPER.sln diff --git a/build_Salome_eclipse.bat b/build_Salome_eclipse.bat index 6cc46a809..b2c3e8a04 100644 --- a/build_Salome_eclipse.bat +++ b/build_Salome_eclipse.bat @@ -9,8 +9,8 @@ popd @SET SRC_DIR=%ROOT_DIR%\sources @SET OCC_LIB_PREFIX=d -@SET NEWGEOM_ROOT_DIR=%ROOT_DIR%\install -@SET SalomeAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui +@SET SHAPER_ROOT_DIR=%ROOT_DIR%\install +@SET SalomeAppConfig=%ROOT_DIR%\install\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui call %SRC_DIR%\env_Salome.bat d mkdir %ROOT_DIR%\build-eclipse diff --git a/build_Salome_rel.bat b/build_Salome_rel.bat index 4f3a06137..7dc13e202 100644 --- a/build_Salome_rel.bat +++ b/build_Salome_rel.bat @@ -15,4 +15,4 @@ cd %ROOT_DIR%\build cmake %SRC_DIR% -G "Visual Studio 10" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install -start "" %MSVC_EXE% NewGEOM.sln +start "" %MSVC_EXE% SHAPER.sln diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 86b762f27..f9ff3e2c6 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -32,7 +32,7 @@ PROJECT_NAME = @CMAKE_PROJECT_NAME@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = @NewGeom_Version@ +PROJECT_NUMBER = @SHAPER_Version@ # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/env_Salome.bat b/env_Salome.bat index a056258e7..0a97e7c72 100644 --- a/env_Salome.bat +++ b/env_Salome.bat @@ -100,9 +100,9 @@ IF "%ARCH%" == "Win64" ( ) @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins -@SET NEWGEOM_ROOT_DIR=%ROOT_DIR%\install -@SET PATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\bin;%PATH% -@SET PYTHONPATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\addons;%NEWGEOM_ROOT_DIR%\pythonAPI;%PYTHONPATH% +@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% -@SET LightAppConfig=%%NEWGEOM_ROOT_DIR%\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui -@SET NewGeomResources=%NEWGEOM_ROOT_DIR%\resources +@SET LightAppConfig=%%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui +@SET SHAPERResources=%SHAPER_ROOT_DIR%\resources diff --git a/msvc10_env.bat b/msvc10_env.bat index e05b56ec1..aaa3a32c1 100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@ -172,11 +172,11 @@ set PATH=%CMAKEDIR%\bin;%PATH% @REM ------------------------- @REM OPENPARTS -@SET NEWGEOM_ROOT_DIR=%ROOT_DIR%\install -@SET NEW_GEOM_CONFIG_FILE=%NEWGEOM_ROOT_DIR%\plugins -@SET PATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\bin;%PATH% -@SET PYTHONPATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\addons;%NEWGEOM_ROOT_DIR%\pythonAPI;%PYTHONPATH% -@SET NewGeomResources=%NEWGEOM_ROOT_DIR%\resources +@SET SHAPER_ROOT_DIR=%ROOT_DIR%\install +@SET NEW_GEOM_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 rem -------- Visual Studio -------------------- rem Detect Visual Studio (either commercial or Express edition) diff --git a/salomeRun.bat b/salomeRun.bat index 6d5ea04a7..010cb93cb 100644 --- a/salomeRun.bat +++ b/salomeRun.bat @@ -2,7 +2,7 @@ call env_Salome.bat -@SET NEWGEOM_ROOT_DIR=%ROOT_DIR%\install -@SET SalomeAppConfig=%NEWGEOM_ROOT_DIR%\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui +@SET SHAPER_ROOT_DIR=%ROOT_DIR%\install +@SET SalomeAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui start %PYTHONBIN% "%KERNEL_ROOT_DIR%\bin\salome\envSalome.py" "%PYTHONBIN%" "%KERNEL_ROOT_DIR%\bin\salome\runSalome.py" %* diff --git a/src/NewGeom/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt similarity index 63% rename from src/NewGeom/CMakeLists.txt rename to src/SHAPERGUI/CMakeLists.txt index 70f406e6f..c8616d383 100644 --- a/src/NewGeom/CMakeLists.txt +++ b/src/SHAPERGUI/CMakeLists.txt @@ -4,24 +4,24 @@ SET(CMAKE_AUTOMOC ON) SET(PROJECT_HEADERS - NewGeom.h - NewGeom_Module.h - NewGeom_DataModel.h - NewGeom_OCCSelector.h - NewGeom_SalomeViewer.h - NewGeom_NestedButton.h + SHAPER_SHAPERGUI.h + SHAPERGUI.h + SHAPERGUI_DataModel.h + SHAPERGUI_OCCSelector.h + SHAPERGUI_SalomeViewer.h + SHAPERGUI_NestedButton.h ) SET(PROJECT_AUTOMOC - ${CMAKE_CURRENT_BINARY_DIR}/NewGeom_automoc.cpp + ${CMAKE_CURRENT_BINARY_DIR}/SHAPERGUI_automoc.cpp ) SET(PROJECT_SOURCES - NewGeom_Module.cpp - NewGeom_DataModel.cpp - NewGeom_OCCSelector.cpp - NewGeom_SalomeViewer.cpp - NewGeom_NestedButton.cpp + SHAPERGUI.cpp + SHAPERGUI_DataModel.cpp + SHAPERGUI_OCCSelector.cpp + SHAPERGUI_SalomeViewer.cpp + SHAPERGUI_NestedButton.cpp ) SET(PROJECT_RESOURCES @@ -45,7 +45,7 @@ SET(PROJECT_LIBRARIES ${CAS_SHAPE} ) -ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} ) +ADD_DEFINITIONS( -DSHAPERGUI_EXPORTS ${CAS_DEFINITIONS} ) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI ${PROJECT_SOURCE_DIR}/src/Events @@ -58,15 +58,15 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI ${CAS_INCLUDE_DIRS} ) -ADD_LIBRARY(NewGeom SHARED +ADD_LIBRARY(SHAPERGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ) -ADD_DEPENDENCIES(NewGeom XGUI) +ADD_DEPENDENCIES(SHAPERGUI XGUI) # The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore -TARGET_LINK_LIBRARIES(NewGeom ${PROJECT_LIBRARIES}) +TARGET_LINK_LIBRARIES(SHAPERGUI ${PROJECT_LIBRARIES}) -INSTALL(TARGETS NewGeom DESTINATION bin) -INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/newgeom ) +INSTALL(TARGETS SHAPERGUI DESTINATION bin) +INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/shaper ) diff --git a/src/NewGeom/NewGeom_Module.cpp b/src/SHAPERGUI/SHAPERGUI.cpp similarity index 100% rename from src/NewGeom/NewGeom_Module.cpp rename to src/SHAPERGUI/SHAPERGUI.cpp diff --git a/src/NewGeom/NewGeom_Module.h b/src/SHAPERGUI/SHAPERGUI.h similarity index 100% rename from src/NewGeom/NewGeom_Module.h rename to src/SHAPERGUI/SHAPERGUI.h diff --git a/src/NewGeom/NewGeom_DataModel.cpp b/src/SHAPERGUI/SHAPERGUI_DataModel.cpp similarity index 100% rename from src/NewGeom/NewGeom_DataModel.cpp rename to src/SHAPERGUI/SHAPERGUI_DataModel.cpp diff --git a/src/NewGeom/NewGeom_DataModel.h b/src/SHAPERGUI/SHAPERGUI_DataModel.h similarity index 100% rename from src/NewGeom/NewGeom_DataModel.h rename to src/SHAPERGUI/SHAPERGUI_DataModel.h diff --git a/src/NewGeom/NewGeom_NestedButton.cpp b/src/SHAPERGUI/SHAPERGUI_NestedButton.cpp similarity index 100% rename from src/NewGeom/NewGeom_NestedButton.cpp rename to src/SHAPERGUI/SHAPERGUI_NestedButton.cpp diff --git a/src/NewGeom/NewGeom_NestedButton.h b/src/SHAPERGUI/SHAPERGUI_NestedButton.h similarity index 100% rename from src/NewGeom/NewGeom_NestedButton.h rename to src/SHAPERGUI/SHAPERGUI_NestedButton.h diff --git a/src/NewGeom/NewGeom_OCCSelector.cpp b/src/SHAPERGUI/SHAPERGUI_OCCSelector.cpp similarity index 100% rename from src/NewGeom/NewGeom_OCCSelector.cpp rename to src/SHAPERGUI/SHAPERGUI_OCCSelector.cpp diff --git a/src/NewGeom/NewGeom_OCCSelector.h b/src/SHAPERGUI/SHAPERGUI_OCCSelector.h similarity index 100% rename from src/NewGeom/NewGeom_OCCSelector.h rename to src/SHAPERGUI/SHAPERGUI_OCCSelector.h diff --git a/src/NewGeom/NewGeom_SalomeViewer.cpp b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp similarity index 100% rename from src/NewGeom/NewGeom_SalomeViewer.cpp rename to src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp diff --git a/src/NewGeom/NewGeom_SalomeViewer.h b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.h similarity index 100% rename from src/NewGeom/NewGeom_SalomeViewer.h rename to src/SHAPERGUI/SHAPERGUI_SalomeViewer.h diff --git a/src/NewGeom/NewGeom.h b/src/SHAPERGUI/SHAPER_SHAPERGUI.h similarity index 100% rename from src/NewGeom/NewGeom.h rename to src/SHAPERGUI/SHAPER_SHAPERGUI.h diff --git a/src/NewGeom/resources/LightApp.xml b/src/SHAPERGUI/resources/LightApp.xml similarity index 100% rename from src/NewGeom/resources/LightApp.xml rename to src/SHAPERGUI/resources/LightApp.xml diff --git a/src/NewGeom/resources/SalomeApp.xml b/src/SHAPERGUI/resources/SalomeApp.xml similarity index 100% rename from src/NewGeom/resources/SalomeApp.xml rename to src/SHAPERGUI/resources/SalomeApp.xml diff --git a/src/NewGeom/resources/newgeom.png b/src/SHAPERGUI/resources/newgeom.png similarity index 100% rename from src/NewGeom/resources/newgeom.png rename to src/SHAPERGUI/resources/newgeom.png diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index b928158f3..bebf1a79c 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -61,7 +61,7 @@ SET(PROJECT_RESOURCES ) SET(PREFERENCES_XML - NewGeom.xml + SHAPER.xml ) SET(TEXT_RESOURCES diff --git a/src/XGUI/NewGeom.xml b/src/XGUI/SHAPER.xml similarity index 100% rename from src/XGUI/NewGeom.xml rename to src/XGUI/SHAPER.xml -- 2.39.2