From e5abc21e333f65742abbd4b7a48c6772cf665c85 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 15 Feb 2016 12:00:36 +0300
Subject: [PATCH] Merge relevant changes from V8_0_0_BR branch

---
 SalomeBLSURFPLUGINConfig.cmake.in     | 48 ++++++++++++++-------------
 src/GUI/BLSURFPluginGUI_StdWidget.cxx | 10 +++---
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/SalomeBLSURFPLUGINConfig.cmake.in b/SalomeBLSURFPLUGINConfig.cmake.in
index 9435163..10ed2e2 100644
--- a/SalomeBLSURFPLUGINConfig.cmake.in
+++ b/SalomeBLSURFPLUGINConfig.cmake.in
@@ -56,32 +56,34 @@ SET(SALOME_BLSURFPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@)
 # Level 1 prerequisites:
 SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_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/src/GUI/BLSURFPluginGUI_StdWidget.cxx b/src/GUI/BLSURFPluginGUI_StdWidget.cxx
index 6dff729..d4fbc76 100644
--- a/src/GUI/BLSURFPluginGUI_StdWidget.cxx
+++ b/src/GUI/BLSURFPluginGUI_StdWidget.cxx
@@ -113,17 +113,17 @@ void BLSURFPluginGUI_StdWidget::resizeWidgets() {
   myMinSize->setMinimumWidth( max_width+50 );
   myMaxSize->setMinimumWidth( max_width+50 );
    // Geometrical parameters
-  metrics1 = myAngleMesh->font();
-  metrics2 = myChordalError->font();
+  metrics1 = QFontMetrics(myAngleMesh->font());
+  metrics2 = QFontMetrics(myChordalError->font());
   width1 = metrics1.width(myAngleMesh->GetString());
   width2 = metrics2.width(myChordalError->GetString());
   max_width = max(width1,width2); 
   myAngleMesh->setMinimumWidth( max_width+50 );
   myChordalError->setMinimumWidth( max_width+50 );
   // Other parameters
-  metrics1 = myAnisotropicRatio->font();
-  metrics2 = myTinyEdgeLength->font();
-  metrics3 = myBadElementAspectRatio->font();
+  metrics1 = QFontMetrics(myAnisotropicRatio->font());
+  metrics2 = QFontMetrics(myTinyEdgeLength->font());
+  metrics3 = QFontMetrics(myBadElementAspectRatio->font());
   width1 = metrics1.width(myAnisotropicRatio->GetString());
   width2 = metrics2.width(myTinyEdgeLength->GetString());
   width3 = metrics3.width(myBadElementAspectRatio->GetString());
-- 
2.39.2