From d613600c564125f79b232d2da0f58bded5713048 Mon Sep 17 00:00:00 2001 From: vsv Date: Mon, 11 Aug 2014 19:04:53 +0400 Subject: [PATCH] Porting on SALOME 7.4.0 --- msvc10_env.bat | 2 +- src/XGUI/XGUI_MainWindow.cpp | 11 ++++++----- src/XGUI/XGUI_Preferences.cpp | 16 ++++------------ 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/msvc10_env.bat b/msvc10_env.bat index 41f21666c..b8ad56208 100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@ -26,7 +26,7 @@ set PATH=%CMAKEDIR%\bin;%PATH% @REM ------------------------- @REM CASCADE -@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.7.0 +@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.7.1 @SET CASROOT=%CAS_ROOT_DIR% @REM ------------------------- diff --git a/src/XGUI/XGUI_MainWindow.cpp b/src/XGUI/XGUI_MainWindow.cpp index b989488c6..28db1de97 100644 --- a/src/XGUI/XGUI_MainWindow.cpp +++ b/src/XGUI/XGUI_MainWindow.cpp @@ -66,11 +66,12 @@ QMdiArea* XGUI_MainWindow::mdiArea() const //****************************************************** void XGUI_MainWindow::showPythonConsole() { - if (!myPythonConsole) { - myPythonConsole = new PyConsole_EnhConsole(this, new PyConsole_EnhInterp()); - undockPythonConsole(); - } - myPythonConsole->parentWidget()->show(); + // TODO: Check why PyConsole can not be created + //if (!myPythonConsole) { + // myPythonConsole = new PyConsole_EnhConsole(this, new PyConsole_EnhInterp()); + // undockPythonConsole(); + //} + //myPythonConsole->parentWidget()->show(); } //****************************************************** diff --git a/src/XGUI/XGUI_Preferences.cpp b/src/XGUI/XGUI_Preferences.cpp index 12a21bee5..06d7fbf15 100644 --- a/src/XGUI/XGUI_Preferences.cpp +++ b/src/XGUI/XGUI_Preferences.cpp @@ -78,26 +78,18 @@ void XGUI_PreferencesDlg::createEditors() tr("First corner gradient") << tr("Second corner gradient") << tr("Third corner gradient") << tr("Fourth corner gradient"); - QList anIndicesList; - QIntList idList; - idList << XGUI::HorizontalGradient << XGUI::VerticalGradient << - XGUI::Diagonal1Gradient << XGUI::Diagonal2Gradient << - XGUI::Corner1Gradient << XGUI::Corner2Gradient << - XGUI::Corner3Gradient << XGUI::Corner4Gradient; - - foreach(int gid, idList ) anIndicesList << gid; + QList idList; + for (int i = 0; i < gradList.size(); i++) + idList << i; int bgGroup = myPreferences->addItem( tr( "Background" ), viewTab ); - //QIntList txtList; - //txtList << Qtx::CenterTexture << Qtx::TileTexture << Qtx::StretchTexture; - QString aImgFiles("Image files (*.bmp *.gif *.pix *.xwd *.rgb *.rs)"); int bgId = myPreferences->addItem( tr("Viewer 3d" ), bgGroup, SUIT_PreferenceMgr::Background, "Viewer", "background" ); myPreferences->setItemProperty( "gradient_names", gradList, bgId ); - //myPreferences->setItemProperty( "gradient_ids", anIndicesList, bgId ); + myPreferences->setItemProperty( "gradient_ids", idList, bgId ); myPreferences->setItemProperty( "texture_enabled", true, bgId ); myPreferences->setItemProperty( "texture_center_enabled", true, bgId ); myPreferences->setItemProperty( "texture_tile_enabled", true, bgId ); -- 2.39.2