Add shaper standalone executable without CORBA

diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt
index 0f427639ddf6b4ed3448f1ffc493062e1fcbe3c9..29bcadc4603f7f8bd35137d1f9bf8f6ae003b506 100644 (file)
--- a/src/Config/CMakeLists.txt
+++ b/src/Config/CMakeLists.txt
@@ -17,6 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+# additional include directories
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
+
 INCLUDE(Common)
 INCLUDE(UnitTest)
 INCLUDE(XMLProcessing)
@@ -24,7 +27,8 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
-                     ${PYTHON_INCLUDE_DIR})
+                     ${PYTHON_INCLUDE_DIR}
+                     ${SALOME_GUI_INCLUDE})
 
 SET(PROJECT_HEADERS
   Config_def.h

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 8cba8cd4d0f040ece44e75023627a1d9bf67876d..a2cd71328753564cfd6987c81f911f7fccf59b90 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -27,6 +27,7 @@
 #include <Events_InfoMessage.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#include <SUIT_Session.h>
 
 #include <fstream>
 #include <sstream>
@@ -168,7 +169,8 @@ void Config_XMLReader::readAll()
   }
 
   // to load external modules dependencies (like GEOM for Connector Feature)
-  Config_ModuleReader::loadScript("salome.shaper.initConfig", false);
+  if(SUIT_Session::session()->executableAppName() == SUIT_Session::session()->salomeAppName())
+    Config_ModuleReader::loadScript("salome.shaper.initConfig", false);
 
   for(int aSolution = 0; true; aSolution++) {
     std::string aFoundFile = findConfigFile(myRootFileName, aSolution);

diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt
index a3f1c93ee8a78b13fc4f960872ea3461570bdd6d..23d3b7995f9de2ad4b6854639e315d7fb7b7515b 100644 (file)
--- a/src/SHAPERGUI/CMakeLists.txt
+++ b/src/SHAPERGUI/CMakeLists.txt
@@ -59,7 +59,9 @@ SET(PROJECT_SOURCES
 
 SET(PROJECT_RESOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/LightApp.xml
+    ${CMAKE_CURRENT_BINARY_DIR}/LightShaperApp.xml
     resources/SalomeApp.xml
+    resources/ShaperApp.xml
     resources/shaper.png
 )
 
@@ -132,6 +134,12 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/LightApp.xml"
   )
 
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/resources/LightShaperApp.xml.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/LightShaperApp.xml"
+  )
+
+
 INSTALL(TARGETS SHAPER DESTINATION ${SHAPER_INSTALL_BIN})
 INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION ${SHAPER_INSTALL_RESOURCES})
 INSTALL(FILES ${QM_RESOURCES} DESTINATION ${SHAPER_INSTALL_QM_RESOURCES})

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index f92d89f69d7bcc8891d76cf276a29844632f8d7d..07308359763f45c423c035b5782fb094dd89701e 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -56,6 +56,7 @@
 #include <SUIT_ViewWindow.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_DataBrowser.h>
+#include <SUIT_Session.h>
 
 #include <QtxPopupMgr.h>
 #include <QtxActionMenuMgr.h>
@@ -1278,6 +1279,8 @@ void SHAPERGUI::resetToolbars()
 
 void SHAPERGUI::publishToStudy()
 {
-  if (isActiveModule() && ModelAPI_Session::get()->hasModuleDocument())
+  if ( (SUIT_Session::session()->executableAppName() == SUIT_Session::session()->salomeAppName())
+       // publish on salome executable mode
+       && isActiveModule() && ModelAPI_Session::get()->hasModuleDocument())
     myWorkshop->module()->launchOperation("PublishToStudy", false);
 }

diff --git a/src/SHAPERGUI/resources/LightShaperApp.xml.in b/src/SHAPERGUI/resources/LightShaperApp.xml.in
new file mode 100644 (file)
index 0000000..c8570e2
--- /dev/null
+++ b/src/SHAPERGUI/resources/LightShaperApp.xml.in
@@ -0,0 +1,49 @@
+<document>
+  <section name="launch">
+    <!-- SALOME (only Shaper) launching parameters -->
+    <parameter name="modules"    value="SHAPER"/>
+  </section>
+  <section name="SHAPER">
+    <!-- Major module parameters -->
+    <parameter name="name" value="Shaper"/>
+    <parameter name="icon" value="shaper.png"/>
+    <parameter name="version" value="@SHAPER_VERSION@"/>
+    <parameter name="documentation" value="shaper_help"/>
+  </section>
+  <section name="shaper_help" >
+    <parameter name="Developer's Guide/Shaper module/Developer's Guide" value="%SHAPER_ROOT_DIR%/share/doc/salome/tui/SHAPER/index.html;;http://docs.salome-platform.org/latest/tui/SHAPER/index.html"/>
+    <parameter name="User's Guide/Shaper module/User's Guide" value="%SHAPER_ROOT_DIR%/share/doc/salome/gui/SHAPER/index.html;;http://docs.salome-platform.org/latest/gui/SHAPER/index.html"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="SHAPER" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="SHAPERGUI" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="ModuleBase" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="PartSet" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+    <parameter name="XGUI" value="%SHAPER_ROOT_DIR%/share/salome/resources/shaper"/>
+  </section>
+  <section name="Viewer" >
+    <!-- Viewer preferences -->
+    <parameter name="face-selection" value="true" />
+    <parameter name="edge-selection" value="true" />
+    <parameter name="vertex-selection" value="true" />
+    <parameter name="point-selection-sensitivity" value="12" />
+    <parameter name="edge-selection-sensitivity" value="2" />
+    <parameter name="highlighting-3d" value="false" />
+    <parameter name="highlighting-2d" value="true" />
+    <parameter name="scalar_bar_x_position" value="0.03" />
+    <parameter name="scalar_bar_y_position" value="0.35" />
+    <parameter name="scalar_bar_width" value="0.2" />
+    <parameter name="scalar_bar_height" value="0.5" />
+    <parameter name="scalar_bar_text_height" value="14" />
+    <parameter name="scalar_bar_nb_intervals" value="20" />
+    <parameter name="scalar_bar_text_color" value="#000000" />
+    <parameter name="shaper_default_transparency" value="0"/>
+  </section>
+  <section name="windows_geometry">
+   <parameter name="SHAPER" value="@ByteArray[#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #03 #00 #00 #00 #00 #00 #00 #01 #00 #00 #00 #02 #DF #FC #02 #00 #00 #00 #02 #FB #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #B0 #00 #00 #02 #3D #00 #00 #00 #00 #00 #00 #00 #00 #FC #00 #00 #00 #B0 #00 #00 #02 #DF #00 #00 #00 #6B #00 #FF #FF #FF #FA #00 #00 #00 #00 #02 #00 #00 #00 #02 #FB #FF #FF #FF #FF #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #6B #00 #FF #FF #FF #FB #00 #00 #00 #26 #00 #70 #00 #72 #00 #6F #00 #70 #00 #65 #00 #72 #00 #74 #00 #79 #00 #5F #00 #70 #00 #61 #00 #6E #00 #65 #00 #6C #00 #5F #00 #64 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #1F #00 #FF #FF #FF #00 #00 #00 #01 #00 #00 #00 #00 #00 #00 #00 #00 #FC #02 #00 #00 #00 #02 #FB #00 #00 #00 #2A #00 #69 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #5F #00 #70 #00 #61 #00 #6E #00 #65 #00 #6C #00 #5F #00 #64 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #D1 #00 #FF #FF #FF #FB #FF #FF #FF #FF #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #70 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #07 #5C #00 #00 #00 #59 #FC #01 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #07 #5C #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #06 #56 #00 #00 #02 #DF #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #04 #00 #00 #00 #02 #00 #00 #00 #05 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #F5 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #08 #00 #50 #00 #61 #00 #72 #00 #74 #01 #00 #00 #01 #B5 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #10 #00 #4D #00 #6F #00 #76 #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #01 #00 #00 #02 #DB #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #16 #00 #4D #00 #65 #00 #61 #00 #73 #00 #75 #00 #72 #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #01 #00 #00 #03 #B1 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #04 #00 #00 #00 #18 #00 #43 #00 #6F #00 #6E #00 #73 #00 #74 #00 #72 #00 #75 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0A #00 #42 #00 #75 #00 #69 #00 #6C #00 #64 #01 #00 #00 #00 #73 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #14 #00 #50 #00 #72 #00 #69 #00 #6D #00 #69 #00 #74 #00 #69 #00 #76 #00 #65 #00 #73 #01 #00 #00 #02 #1D #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #08 #00 #47 #00 #44 #00 #4D #00 #4C #01 #00 #00 #02 #D2 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #05 #00 #00 #00 #10 #00 #46 #00 #65 #00 #61 #00 #74 #00 #75 #00 #72 #00 #65 #00 #73 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0E #00 #42 #00 #6F #00 #6F #00 #6C #00 #65 #00 #61 #00 #6E #01 #00 #00 #01 #9E #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #16 #00 #43 #00 #6F #00 #6C #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #02 #D7 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0C #00 #46 #00 #69 #00 #6C #00 #6C #00 #65 #00 #74 #01 #00 #00 #03 #08 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0C #00 #4D #00 #61 #00 #63 #00 #72 #00 #6F #00 #73 #01 #00 #00 #03 #5A #00 #00 #04 #02 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #0C #00 #53 #00 #6B #00 #65 #00 #74 #00 #63 #00 #68 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1E #00 #49 #00 #4E #00 #53 #00 #50 #00 #57 #00 #43 #00 #54 #00 #49 #00 #4F #00 #4E #00 #5F #00 #54 #00 #4F #00 #4F #00 #4C #01 #00 #00 #04 #48 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00]"/>
+  </section>
+  <section name="windows_geometry_version">
+    <parameter name="SHAPER" value="8.5.0"/>
+  </section>
+</document>

diff --git a/src/SHAPERGUI/resources/ShaperApp.xml b/src/SHAPERGUI/resources/ShaperApp.xml
new file mode 100644 (file)
index 0000000..f306516
--- /dev/null
+++ b/src/SHAPERGUI/resources/ShaperApp.xml
@@ -0,0 +1,3 @@
+<document>
+  <import name="LightShaperApp"/>
+</document>