Porting on SALOME 7.4.0

diff --git a/msvc10_env.bat b/msvc10_env.bat
index 41f21666cf7153e110bd6cd26e77ee086758fe78..b8ad5620875143a3e1938fcf583674e68504ba86 100644 (file)
--- 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 b989488c694c9c4b8f2959f7c54852bd8f4c1104..28db1de97dd13948b96f4b5847a386859df9ec6f 100644 (file)
--- 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 12a21bee538de6107c96afab883b8837fde4530f..06d7fbf15637ab0252d5a5d466fe72b8cf172766 100644 (file)
--- 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<QVariant> 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<QVariant> 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 );