Migration to OCCT 7.0

[modules/hexablock.git] / src / HEXABLOCKGUI / HEXABLOCKGUI.cxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index 98318005d58da2b06d3fe9d3812919c700e0c7ea..01c29f0068bf25f503c4ffc7cc4a5d3bb2f05bc8 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,10 +21,12 @@
 
 #include <cassert>
 
-
+#include <QDir>
 #include <QInputDialog>
 #include <QIcon>
 #include <QStackedWidget>
+#include <QMenu>
+#include <QSplitter>
 
 #include <QtxTreeView.h>
 #include <SUIT_MessageBox.h>
@@ -72,7 +74,6 @@
 
 
 #include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
 
 
 #include <SALOME_LifeCycleCORBA.hxx>
@@ -106,8 +107,6 @@
 // #include "HexDocument_impl.hxx"         del Hexa6
 #include "Hex.hxx"
 
-
-#include <Visual3d_ViewManager.hxx>
 //#include <V3d_PerspectiveView.hxx>
 #include <V3d_AmbientLight.hxx>
 #include <V3d_DirectionalLight.hxx>
@@ -119,6 +118,7 @@
 
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 
+#include <utilities.h>
 
 #define DW_MINIMUM_WIDTH       50
 #define DWINPUT_MINIMUM_HEIGHT 50
@@ -453,7 +453,7 @@ void HEXABLOCKGUI::addInStudy(QMap<QString, TopoDS_Shape>& topo_shapes,
     SOCC_Prs* prs = getOccPrs(currentDocGView);
     if (prs == NULL)
     {
-        prs = new SOCC_Prs();
+        prs = new SOCC_Prs(0);
         isNewPrs = true;
     }
 
@@ -538,7 +538,9 @@ void HEXABLOCKGUI::windows( QMap<int, int>& theMap ) const
     DEBTRACE("HEXABLOCKGUI::windows");
     theMap.clear();
     theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+#ifndef DISABLE_PYCONSOLE
     theMap.insert( SalomeApp_Application::WT_PyConsole,     Qt::BottomDockWidgetArea );
+#endif
 }
 
 QString  HEXABLOCKGUI::engineIOR() const