From: nds Date: Sat, 27 Dec 2014 15:41:37 +0000 (+0300) Subject: a fix for bug #98 and rectangle, concerned to SALOME 7.5.1 X-Git-Tag: V_0.7.0_rc1~25 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=760a7a289b307a496b822d89ec04c60e0654af71;p=modules%2Fshaper.git a fix for bug #98 and rectangle, concerned to SALOME 7.5.1 The commented code should be removed after test campaign --- diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp index c550b23a6..50d95a7a0 100644 --- a/src/ModuleBase/ModuleBase_Preferences.cpp +++ b/src/ModuleBase/ModuleBase_Preferences.cpp @@ -288,12 +288,12 @@ void ModuleBase_PreferencesDlg::modified(ModuleBase_Prefs& theModified) const void ModuleBase_PreferencesDlg::onDefault() { // reset main resources -#ifdef SALOME_750 // until SALOME 7.5.0 is released +//#ifdef SALOME_750 // until SALOME 7.5.0 is released QtxResourceMgr::WorkingMode aPrev = myPreferences->resourceMgr()->setWorkingMode(QtxResourceMgr::IgnoreUserValues); myPreferences->retrieve(); myPreferences->resourceMgr()->setWorkingMode(aPrev); -#endif +//#endif // reset plugin's resources ModuleBase_Preferences::resetConfig(); ModuleBase_Preferences::updateResourcesByConfig(); diff --git a/src/NewGeom/NewGeom_SalomeViewer.cpp b/src/NewGeom/NewGeom_SalomeViewer.cpp index 8fe9bd862..b1810b0e9 100644 --- a/src/NewGeom/NewGeom_SalomeViewer.cpp +++ b/src/NewGeom/NewGeom_SalomeViewer.cpp @@ -192,8 +192,8 @@ void NewGeom_SalomeViewer::enableSelection(bool isEnabled) // there is a fix for a black-colored window // the viewer rubber band is valid if the values delta is less than 1 // TODO: remove this row after moving to SALOME 7.5 - mySelector->viewer()->setInteractionStyle(isEnabled ? SUIT_ViewModel::STANDARD - : SUIT_ViewModel::KEY_FREE); + //mySelector->viewer()->setInteractionStyle(isEnabled ? SUIT_ViewModel::STANDARD + // : SUIT_ViewModel::KEY_FREE); } //**********************************************