Merge branch 'releases/FreeCAD-0-14' of ssh://git.code.sf.net/p/free-…

…cad/code into releases/FreeCAD-0-14
FreeCAD · Jul 11, 2014 · e46ec63 · e46ec63
2 parents df36b5d + 52561ad
commit e46ec63
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp
@@ -75,7 +75,7 @@
 # include <BRepTools.hxx>
 # include <BRepTools_ReShape.hxx>
 # include <BRepTools_ShapeSet.hxx>
-#include <BRepFill_CompatibleWires.hxx>
+# include <BRepFill_CompatibleWires.hxx>
 # include <GCE2d_MakeSegment.hxx>
 # include <Geom2d_Line.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
@@ -91,6 +91,7 @@
 # include <Handle_Law_BSpline.hxx>
 # include <Handle_TopTools_HSequenceOfShape.hxx>
 # include <Law_BSpFunc.hxx>
+# include <Law_Constant.hxx>
 # include <Law_Linear.hxx>
 # include <Law_S.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
@@ -1463,15 +1464,16 @@ static Handle(Law_Function) CreateBsFunction (const Standard_Real theFirst, cons
 {
     //Handle_Law_BSpline aBs;
     //Handle_Law_BSpFunc aFunc = new Law_BSpFunc (aBs, theFirst, theLast);
-    Handle_Law_Linear aFunc = new Law_Linear();
-    aFunc->Set(theFirst, theRadius, theLast, theRadius);
+    Handle_Law_Constant aFunc = new Law_Constant();
+    aFunc->Set(1, theFirst, theLast);
     return aFunc;
 }
 
 TopoDS_Shape TopoShape::makeTube(double radius, double tol, int cont, int maxdegree, int maxsegm) const
 {
     // http://opencascade.blogspot.com/2009/11/surface-modeling-part3.html
     Standard_Real theTol = tol;
+    Standard_Real theRadius = radius;
     //Standard_Boolean theIsPolynomial = Standard_True;
     Standard_Boolean myIsElem = Standard_True;
     GeomAbs_Shape theContinuity = GeomAbs_Shape(cont);
@@ -1500,11 +1502,11 @@ TopoDS_Shape TopoShape::makeTube(double radius, double tol, int cont, int maxdeg
     }
 
     //circular profile
-    Handle(Geom_Circle) aCirc = new Geom_Circle (gp::XOY(), radius);
+    Handle(Geom_Circle) aCirc = new Geom_Circle (gp::XOY(), theRadius);
     aCirc->Rotate (gp::OZ(), M_PI/2.);
 
     //perpendicular section
-    Handle(Law_Function) myEvol = ::CreateBsFunction (myPath->FirstParameter(), myPath->LastParameter(), radius);
+    Handle(Law_Function) myEvol = ::CreateBsFunction (myPath->FirstParameter(), myPath->LastParameter(), theRadius);
     Handle(GeomFill_SectionLaw) aSec = new GeomFill_EvolvedSection(aCirc, myEvol);
     Handle(GeomFill_LocationLaw) aLoc = new GeomFill_CurveAndTrihedron(new GeomFill_CorrectedFrenet);
     aLoc->SetCurve (myPath);

diff --git a/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi b/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi
@@ -77,6 +77,8 @@ section "install"
 	setOutPath $INSTDIR\bin
 	# Files added here should be removed by the uninstaller (see section "uninstall")
 	file /r /X *.idb /X *.pyc /X *.pyo "..\..\bin\"
+	setOutPath $INSTDIR\lib
+	file /r /X *.lib /X *.pyc /X *.pyo "..\..\lib\"
 	setOutPath $INSTDIR\Mod
 	file /r /X *.idb  "..\..\Mod\"
 	setOutPath $INSTDIR\doc
@@ -139,12 +141,14 @@ section "uninstall"
 
 	# Remove files
 	rmDir /r "$INSTDIR\bin"
+	rmDir /r "$INSTDIR\lib"
 	rmDir /r "$INSTDIR\doc"
 	rmDir /r "$INSTDIR\data"
 	rmDir /r "$INSTDIR\Mod"
 
 	# Always delete uninstaller as the last action
 	delete $INSTDIR\uninstall.exe
+	delete $INSTDIR\vcredist_x86.exe
  	# Try to remove the install directory - this will only happen if it is empty
 	rmDir $INSTDIR