From 3a040dd8ae63705d0f8c9ab34897b7765675a905 Mon Sep 17 00:00:00 2001 From: mpv Date: Mon, 24 Jul 2017 10:32:55 +0300 Subject: [PATCH] Migration of branch to the newest SALOME (same as master) --- env.sh | 5 +---- src/SHAPERGUI/SHAPERGUI.cpp | 2 +- src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/env.sh b/env.sh index 5b27f9ed0..4591db57a 100644 --- 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 da00b44bf..c4580759f 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -64,7 +64,7 @@ #include #include -//#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 0af846aa2..dc11d995f 100644 --- a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp +++ b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp @@ -33,7 +33,7 @@ #include #include -//#define SALOME_PATCH_FOR_CTRL_WHEEL +#define SALOME_PATCH_FOR_CTRL_WHEEL SHAPERGUI_SalomeView::SHAPERGUI_SalomeView(OCCViewer_Viewer* theViewer) : ModuleBase_IViewWindow(), myCurrentView(0) -- 2.39.2