Migration of branch to the newest SALOME (same as master)

diff --git a/env.sh b/env.sh
index 5b27f9ed0c2fed20462fda9b693ea9afcd7cdedc..4591db57a68eb17db53c1724cd09bff706d89179 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -11,11 +11,8 @@ export AUT_DIR=$(pwd)
 export TOOLS_DIR=$(pwd)
 
 export HOME_OLD=$HOME
-# to use patched OCCT 7.1.0 for SHAPER
-#export CUSTOM_CAS_ROOT=1
-#export ENV_FOR_LAUNCH=1
 
-source /dn64/series8x/work/init.sh 2017-03-22
+source /dn46/SALOME/series8x/current-2017-07-11/start.sh
 export HOME=$HOME_OLD
 
 # Path to solvespace-2

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index da00b44bf2f5ad620b2d47b690f7d0993ecfcbb1..c4580759f3bdb8dc0877664fee3193d16872d261 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -64,7 +64,7 @@
 #include <QTimer>
 #include <QMenu>
 
-//#define SALOME_PATCH_FOR_CTRL_WHEEL
+#define SALOME_PATCH_FOR_CTRL_WHEEL
 
 extern "C" {
 SHAPERGUI_EXPORT CAM_Module* createModule()

diff --git a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
index 0af846aa2d92940fc32b0c535c5740e34e841e5c..dc11d995f7482e637d411d1dd29e428735f45030 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
+++ b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
@@ -33,7 +33,7 @@
 #include <QMouseEvent>
 #include <QContextMenuEvent>
 
-//#define SALOME_PATCH_FOR_CTRL_WHEEL
+#define SALOME_PATCH_FOR_CTRL_WHEEL
 
 SHAPERGUI_SalomeView::SHAPERGUI_SalomeView(OCCViewer_Viewer* theViewer)
 : ModuleBase_IViewWindow(), myCurrentView(0)