Merge relevant changes from V8_0_0_BR branch

diff --git a/SalomeHEXABLOCKConfig.cmake.in b/SalomeHEXABLOCKConfig.cmake.in
index cf0d9a7a59b1603d1406356ff82f043e971f251d..9e04c28fd69e161a9d08efcb6b25832e40250ff4 100644 (file)
--- a/SalomeHEXABLOCKConfig.cmake.in
+++ b/SalomeHEXABLOCKConfig.cmake.in
@@ -56,32 +56,34 @@ SET(SALOME_HEXABLOCK_BUILD_GUI   @SALOME_BUILD_GUI@)
 # Level 1 prerequisites:
 SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@")
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

diff --git a/doc/conf.py.in b/doc/conf.py.in
index f4564a23ca04f4df632ae450b74ae8918bd0763c..d142090171fd2d9b9b8774daad2024df39e65331 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -105,7 +105,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = '@SPHINX_THEME@'
 
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index 63692c5241c52af06fe778ed2263a93c1edd3e5d..f7f508bc48d74f4b4ec8ed8c05ceab61c61a7723 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -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>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
index e0c6e37c907136b5ed2dbeaa5eaadc8356d90c93..13f961708f4fccc93c82ae656e2a29148882beb1 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
@@ -45,6 +45,7 @@
 #include "HEXABLOCKGUI_OCCSelector.h"
 #include "hexa_base.hxx"
 
+class QDir;
 
 // #include CORBA_CLIENT_HEADER(HEXABLOCK_Gen)  // Abu Juin 2013
 

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
index 4cd0be440a8fab1e29e9b22931984ab9594843f1..9e95e85c8abf06a483d49b18bddb894118dde3e8 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
@@ -42,7 +42,7 @@ QStandardItem()
        {
                setText(m_DocElt->getName());
                if ( m_DocElt->isAssociated() )
-                   setData(Qt::darkGreen, Qt::ForegroundRole);
+                  setData(QColor(Qt::darkGreen), Qt::ForegroundRole);
        }
        setData( treeRole,    HEXA_TREE_ROLE );
        setData( entry,       HEXA_DOC_ENTRY_ROLE);

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
index 76cfb961131249c7062a77b3a4f5b875bdbe0dc8..9ec2dd28af4497a1cec52f4082da5eb4e0439105 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
@@ -25,8 +25,9 @@
 
 #include "Hex.hxx"
 #include <iostream>
-#include <QtGui>
 #include <QFlags>
+#include <QKeyEvent>
+#include <QStyledItemDelegate>
 
 #include <SalomeApp_Application.h>
 #include <SalomeApp_Study.h>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.cxx
index c8958c6b03645b97d007da43e9c682109d4e7d11..0b9a14c02d9b7e1f98ff2f5505645bf64b52a7dd 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.cxx
@@ -326,8 +326,8 @@ void PatternDataSelectionModel::highlightTreeItems(QModelIndexList& indexes,
     {
         if (anItemIndex.isValid())
         {
-            theModel->setData(anItemIndex, fgColor, Qt::ForegroundRole);
-            theModel->setData(anItemIndex, bgColor, Qt::BackgroundRole);
+            theModel->setData(anItemIndex, QColor(fgColor), Qt::ForegroundRole);
+            theModel->setData(anItemIndex, QColor(bgColor), Qt::BackgroundRole);
             currentHighlightedItems << anItemIndex;
         }
     }
@@ -350,8 +350,8 @@ void PatternDataSelectionModel::unhighlightTreeItems(bool clearSelected)
     {
         if (anItemIndex.isValid())
         {
-            theModel->setData(anItemIndex, Qt::darkGreen, Qt::ForegroundRole);
-            theModel->setData(anItemIndex, Qt::white, Qt::BackgroundRole);
+            theModel->setData(anItemIndex, QColor(Qt::darkGreen), Qt::ForegroundRole);
+            theModel->setData(anItemIndex, QColor(Qt::white), Qt::BackgroundRole);
         }
     }
     currentHighlightedItems.clear();
@@ -591,8 +591,8 @@ void PatternGeomSelectionModel::highlightTreeItems(QModelIndexList& indexes,
     {
         if (anItemIndex.isValid())
         {
-            theModel->setData(anItemIndex, fgColor, Qt::ForegroundRole);
-            theModel->setData(anItemIndex, bgColor, Qt::BackgroundRole);
+            theModel->setData(anItemIndex, QColor(fgColor), Qt::ForegroundRole);
+            theModel->setData(anItemIndex, QColor(bgColor), Qt::BackgroundRole);
             currentHighlightedItems << anItemIndex;
         }
     }
@@ -614,8 +614,8 @@ void PatternGeomSelectionModel::unhighlightTreeItems(bool clearSelected)
     {
         if (anItemIndex.isValid())
         {
-            theModel->setData(anItemIndex, Qt::darkGreen, Qt::ForegroundRole);
-            theModel->setData(anItemIndex, Qt::white, Qt::BackgroundRole);
+            theModel->setData(anItemIndex, QColor(Qt::darkGreen), Qt::ForegroundRole);
+            theModel->setData(anItemIndex, QColor(Qt::white), Qt::BackgroundRole);
         }
     }
     currentHighlightedItems.clear();

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx
index 36629d1e5d9294f5bfee13a360b4e24ba138596b..7a6260248c3fe926101c97dff0ccaebfb062f77b 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.cxx
@@ -55,11 +55,11 @@ bool HEXABLOCKGUI_Resource::booleanValue(const QString& name, const bool def) co
   return _resource->booleanValue(RESOURCE_HEXABLOCK, name, def);
 }
 
-QFont HEXABLOCKGUI_Resource::fontValue(const QString& name, const QFont def) const {
+QFont HEXABLOCKGUI_Resource::fontValue(const QString& name, const QFont& def) const {
   return _resource->fontValue(RESOURCE_HEXABLOCK, name, def);
 }
 
-QColor HEXABLOCKGUI_Resource::colorValue(const QString& name, const QColor def) const {
+QColor HEXABLOCKGUI_Resource::colorValue(const QString& name, const QColor& def) const {
   return _resource->colorValue(RESOURCE_HEXABLOCK, name, def);
 }
 
@@ -74,7 +74,7 @@ QColor HEXABLOCKGUI_Resource::colorValue(const QString& name, const int h, const
   return colorValue(name, col);
 }
 
-QString HEXABLOCKGUI_Resource::stringValue(const QString& name, const QString def) const {
+QString HEXABLOCKGUI_Resource::stringValue(const QString& name, const QString& def) const {
   return _resource->stringValue(RESOURCE_HEXABLOCK, name, def);
 }
 
@@ -93,15 +93,15 @@ void HEXABLOCKGUI_Resource::setValue( const QString& name, const bool val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
-void HEXABLOCKGUI_Resource::setValue( const QString& name, const QFont val ) {
+void HEXABLOCKGUI_Resource::setValue( const QString& name, const QFont& val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
-void HEXABLOCKGUI_Resource::setValue( const QString& name, const QColor val ) {
+void HEXABLOCKGUI_Resource::setValue( const QString& name, const QColor& val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 
-void HEXABLOCKGUI_Resource::setValue( const QString& name, const QString val ) {
+void HEXABLOCKGUI_Resource::setValue( const QString& name, const QString& val ) {
     _resource->setValue(RESOURCE_HEXABLOCK, name, val);
 }
 

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
index 5f790dab70d9e62b4dc5705d8d19938cef5f59f0..79f8e3355ba22e2cde6b836031a0346d5fc767dd 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
@@ -20,15 +20,15 @@
 #ifndef _HEXABLOCKGUI_RESOURCE_HXX_
 #define _HEXABLOCKGUI_RESOURCE_HXX_
 
-#include "HEXABLOCKGUI_Export.hxx"
+#include <QColor>
+#include <QFont>
+#include <QString>
 
-#include <QtGui>
+#include "HEXABLOCKGUI_Export.hxx"
 
 class HEXABLOCKGUI;
 class SUIT_ResourceMgr;
 
-
-
 class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource 
 {
   public:
@@ -38,25 +38,24 @@ class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource
     virtual void preferencesChanged();
 
   protected:
-    int     integerValue( const QString& name, const int    def = 0          ) const;
-    double  doubleValue ( const QString& name, const double def = 0          ) const;
-    bool    booleanValue( const QString& name, const bool   def = false      ) const;
-    QFont   fontValue   ( const QString& name, const QFont  def = QFont()    ) const;
-    QColor  colorValue  ( const QString& name, const QColor def = QColor()   ) const;
-    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c       ) const;
-    QColor  colorValue  ( const QString& name, const int h, const int s, const int v) const;
-    QString stringValue ( const QString& name, const QString def = QString() ) const;
-
-    void setValue( const QString& name, const int     val );
-    void setValue( const QString& name, const double  val );
-    void setValue( const QString& name, const bool    val );
-    void setValue( const QString& name, const QFont   val );
-    void setValue( const QString& name, const QColor  val );
-    void setValue( const QString& name, const QString val );
+    int     integerValue( const QString& name, const int     def = 0          ) const;
+    double  doubleValue ( const QString& name, const double  def = 0          ) const;
+    bool    booleanValue( const QString& name, const bool    def = false      ) const;
+    QFont   fontValue   ( const QString& name, const QFont&  def = QFont()    ) const;
+    QColor  colorValue  ( const QString& name, const QColor& def = QColor()   ) const;
+    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c        ) const;
+    QColor  colorValue  ( const QString& name, const int h, const int s, const int v ) const;
+    QString stringValue ( const QString& name, const QString& def = QString() ) const;
+
+    void setValue( const QString& name, const int      val );
+    void setValue( const QString& name, const double   val );
+    void setValue( const QString& name, const bool     val );
+    void setValue( const QString& name, const QFont&   val );
+    void setValue( const QString& name, const QColor&  val );
+    void setValue( const QString& name, const QString& val );
 
   protected:
     SUIT_ResourceMgr* _resource;
-
 };
 
 

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
index 4882a13022df4b6587c0f93e60948ff14eb96718..66be6ed72ad92985b687f43522d88785afed6c72 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.cxx
@@ -33,6 +33,8 @@
 #include "HEXABLOCKGUI_VtkDocumentGraphicView.hxx"
 #include "HEXABLOCKGUI.hxx"
 
+#include <QScrollBar>
+
 #ifndef M_PI
 #define M_PI 3.1415927
 #endif

diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
index eb1e5db670891835cf993e79364b4ba0d4418afe..0ab5dc206d58f3cb74e34c4d5eabd064f2aa2379 100644 (file)
--- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
+++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
@@ -34,6 +34,7 @@
 #include <QRadioButton>
 #include <QMenu>
 #include <QTimer>
+#include <QVector3D>
 
 #include <gp_Pnt.hxx>
 #include <TopoDS_Shape.hxx>
@@ -968,13 +969,13 @@ void MyBasicGUI_PointDlg::updateParamCoord(bool theIsUpdate)
         }
     }
     else if (id == GEOM_POINT_SURF) {
-        GroupOnSurface->TextLabel2->setShown(isParam);
-        GroupOnSurface->TextLabel3->setShown(isParam);
-        GroupOnSurface->SpinBox_DX->setShown(isParam);
-        GroupOnSurface->SpinBox_DY->setShown(isParam);
+        GroupOnSurface->TextLabel2->setVisible(isParam);
+        GroupOnSurface->TextLabel3->setVisible(isParam);
+        GroupOnSurface->SpinBox_DX->setVisible(isParam);
+        GroupOnSurface->SpinBox_DY->setVisible(isParam);
     }
 
-    GroupXYZ->setShown(!isParam && !isLength);
+    GroupXYZ->setVisible(!isParam && !isLength);
 }
 
 //=================================================================================

diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx
index 8304b3d7f76a22f1cc55d9e9080ed7a69fd3ad71..6b3e77491a943db5ab79897db07b7dda36f7c6bc 100644 (file)
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.cxx
@@ -19,7 +19,7 @@
     02110-1301, USA.
 */
 
-#include <QtCore/QObject>
+#include <QObject>
 #include "klinkitemselectionmodel.hxx"
 // #include "klinkitemselectionmodel_p.hxx"
 

diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
index 6172392509c678860a019fad5a2fb7cfb81175e6..97f775be94e8bca0f8064fe34722e3978c3d1ebe 100644 (file)
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -24,9 +24,9 @@
 
 #include "HEXABLOCKGUI_Export.hxx"\r
 
-#include <QtCore/QObject>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QAbstractProxyModel>
+#include <QObject>
+#include <QItemSelectionModel>
+#include <QAbstractProxyModel>
 
 #include <iostream>
 

diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
index a215ae0b5014fe07bb5eace2f75a28da7f53c329..750d1fcbe31096544bc4645cb89fc65db9cb3cdc 100644 (file)
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
@@ -21,10 +21,10 @@
 
 #include "kmodelindexproxymapper.hxx"
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QWeakPointer>
-#include <QtGui/QAbstractProxyModel>
-#include <QtGui/QItemSelectionModel>
+#include <QAbstractItemModel>
+#include <QWeakPointer>
+#include <QAbstractProxyModel>
+#include <QItemSelectionModel>
 
 // #include "kdebug.h"