Releases/free cad 0 15

CMakeLists.txt

@@ -1,10 +1,10 @@
 project(FreeCAD_trunk)
-set(FREECAD_VERSION "0.14")
+set(FREECAD_VERSION "0.15")
 
 set(PACKAGE_NAME "FreeCAD")
 set(PACKAGE_VERSION_MAJOR "0")
-set(PACKAGE_VERSION_MINOR "14")
-set(PACKAGE_VERSION_PATCH "3700")
+set(PACKAGE_VERSION_MINOR "15")
+set(PACKAGE_VERSION_PATCH "4664")
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 

src/Gui/GuiApplicationNativeEventAware.cpp

@@ -100,9 +100,8 @@ void Gui::GUIApplicationNativeEventAware::initSpaceball(QMainWindow *window)
 
 bool Gui::GUIApplicationNativeEventAware::processSpaceballEvent(QObject *object, QEvent *event)
 {
-    // Maybe this causes the regression reported in #0001970. So to test it it will be commented out for now
-    //if (!activeWindow())
-    //    return true;
+    if (!activeWindow())
+        return true;
 
     QApplication::notify(object, event);
     if (event->type() == Spaceball::MotionEvent::MotionEventType)

src/Main/MainGui.cpp

@@ -191,10 +191,12 @@ int main( int argc, char ** argv )
     QFile::setDecodingFunction(myDecoderFunc);
     // Make sure that we use '.' as decimal point. See also
     // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
+    putenv("LC_ALL=");
     putenv("LC_NUMERIC=C");
     putenv("PYTHONPATH=");
 #elif defined(FC_OS_MACOSX)
     (void)QLocale::system();
+    putenv("LC_ALL=");
     putenv("LC_NUMERIC=C");
     putenv("PYTHONPATH=");
 #else

src/Mod/Fem/MechanicalAnalysis.py

@@ -214,9 +214,9 @@ def __init__(self,object):
         # the categories are shown only if they are not empty.
         self.form=FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalAnalysis.ui")
         from platform import system
-        if system == 'Linux':
+        if system() == 'Linux':
           self.CalculixBinary = 'ccx'
-        elif  system == 'Windows':
+        elif  system() == 'Windows':
           self.CalculixBinary = FreeCAD.getHomePath() + 'bin/ccx.exe'
         else:
           self.CalculixBinary = 'ccx'

src/Mod/Fem/MechanicalMaterial.py

@@ -230,7 +230,7 @@ def chooseMat(self,index):
     def fillMaterialCombo(self):
         import glob,os
         matmap = self.obj.Material
-        dirname =  FreeCAD.ConfigGet("AppHomePath")+"data/Mod/Material/StandardMaterial" 
+        dirname =  FreeCAD.getResourceDir()+"/Mod/Material/StandardMaterial"
         self.pathList = glob.glob(dirname + '/*.FCMat')
         self.form.comboBox_MaterialsInDir.clear()
         '''if(matmap.has_key('General_name')):

src/Mod/Part/App/modelRefine.cpp

@@ -61,6 +61,7 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <Base/Console.h>
 #include "modelRefine.h"
 
 using namespace ModelRefine;
@@ -767,6 +768,8 @@ FaceTypedBSpline::FaceTypedBSpline() : FaceTypedBase(GeomAbs_BSplineSurface)
 
 bool FaceTypedBSpline::isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const
 {
+  try
+  {
     Handle(Geom_BSplineSurface) surfaceOne = Handle(Geom_BSplineSurface)::DownCast(BRep_Tool::Surface(faceOne));
     Handle(Geom_BSplineSurface) surfaceTwo = Handle(Geom_BSplineSurface)::DownCast(BRep_Tool::Surface(faceTwo));
 
@@ -849,6 +852,22 @@ bool FaceTypedBSpline::isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &fa
         if (vKnotSequenceOne.Value(indexV) != vKnotSequenceTwo.Value(indexV))
             return false;
     return true;
+  }
+  catch (Standard_Failure)
+  {
+    Handle(Standard_Failure) e = Standard_Failure::Caught();
+    std::ostringstream stream;
+    stream << "FaceTypedBSpline::isEqual: OCC Error: " << e->GetMessageString() << std::endl;
+    Base::Console().Message(stream.str().c_str());
+  }
+  catch (...)
+  {
+    std::ostringstream stream;
+    stream << "FaceTypedBSpline::isEqual: Unknown Error" << std::endl;
+    Base::Console().Message(stream.str().c_str());
+  }
+
+  return false;
 }
 
 GeomAbs_SurfaceType FaceTypedBSpline::getType() const

src/Tools/makedist.py

@@ -43,7 +43,7 @@ def main():
     revision='%04d' % (info.count('\n'))
 
     PACKAGE_NAME = 'freecad'
-    version = "0.14.%s" % (revision)
+    version = "0.15.%s" % (revision)
 
     DIRNAME = "%(p)s-%(v)s" % {'p': PACKAGE_NAME, 'v': version}
     TARNAME = DIRNAME + '.tar'