From f08e6ba7a4b4a6b48ddfca3b7a6363a0a046c8b4 Mon Sep 17 00:00:00 2001
From: mpv <mikhail.ponikarov@opencascade.com>
Date: Wed, 27 Jun 2018 11:26:43 +0300
Subject: [PATCH] Useful commits from master

---
 env.sh                                     | 2 +-
 src/GeomAlgoAPI/GeomAlgoAPI_Filling.cpp    | 3 ++-
 src/ModelHighAPI/ModelHighAPI_Dumper.cpp   | 3 ++-
 src/ModuleBase/ModuleBase_ParamSpinBox.cpp | 1 +
 src/PartSet/PartSet_OperationPrs.cpp       | 7 ++++++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/env.sh b/env.sh
index 0bdc891c8..a1de6f2e2 100644
--- a/env.sh
+++ b/env.sh
@@ -11,7 +11,7 @@ export AUT_DIR=$(pwd)
 export TOOLS_DIR=$(pwd)
 
 export HOME_OLD=$HOME
-source /dn46/SALOME/series8x/current-2018-05-03/start.sh
+source /dn46/SALOME/series8x/current-2018-05-30/start.sh
 export HOME=$HOME_OLD
 
 # Path to solvespace-2
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Filling.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Filling.cpp
index f08f44a4f..3609b06ff 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Filling.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Filling.cpp
@@ -102,7 +102,8 @@ void GeomAlgoAPI_Filling::buildByEdges()
 
   // check myMaxDegree >= aCurves.size() - 1 to be able to interpolate a surface
   if (myMaxDegree + 1 < aNbCurves) {
-    myError = "Unable to interpolate surface, Max deg + 1 should be greater or equal than number of sections.";
+    myError = "Unable to interpolate surface,"
+       " Max deg + 1 should be greater or equal than number of sections.";
     return;
   }
 
diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index 6e6a7090b..985e6761e 100644
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -174,7 +174,8 @@ const std::string& ModelHighAPI_Dumper::name(const EntityPtr& theEntity,
       int aFullIndex = 0;
       NbFeaturesMap::const_iterator aFIt = myFeatureCount.begin();
       for (; aFIt != myFeatureCount.end(); ++aFIt) {
-        std::map<std::string, std::pair<int, int> >::const_iterator aFound = aFIt->second.find(aKind);
+        std::map<std::string, std::pair<int, int> >::const_iterator aFound =
+          aFIt->second.find(aKind);
         if (aFound != aFIt->second.end())
           aFullIndex += aFound->second.first;
       }
diff --git a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp
index 37d888213..4e99f887e 100644
--- a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp
+++ b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp
@@ -40,6 +40,7 @@
 
 #include <string>
 #include <iostream>
+#include <cfloat>
 
 //#define DEBUG_COMPLETE_WITH_PARAMETERS
 
diff --git a/src/PartSet/PartSet_OperationPrs.cpp b/src/PartSet/PartSet_OperationPrs.cpp
index 720a0ea9c..1781e96ae 100755
--- a/src/PartSet/PartSet_OperationPrs.cpp
+++ b/src/PartSet/PartSet_OperationPrs.cpp
@@ -141,7 +141,12 @@ void PartSet_OperationPrs::Compute(
         setWidth(aDrawer, aWidth);
       }
     }
-    StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
+    try {
+      StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
+    }
+    catch (...) {
+      return;
+    }
   }
   Set(aComp);
   if (!aReadyToDisplay) {
-- 
2.39.2