+ rework BoundingBox class and its Python binding

FreeCAD · Oct 10, 2015 · a4d1dbe · a4d1dbe
1 parent 716130c
commit a4d1dbe
Show file tree

Hide file tree

Showing 39 changed files with 1,166 additions and 841 deletions.
diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h
@@ -47,6 +47,7 @@
 #ifdef FC_OS_WIN32
 #include <direct.h>
 #define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #include <crtdbg.h>
 #endif

diff --git a/src/Base/BoundBox.h b/src/Base/BoundBox.h
diff --git a/src/Base/BoundBoxPy.xml b/src/Base/BoundBoxPy.xml
@@ -27,22 +27,68 @@ App.BoundBox(Vector, Vector)
 App.BoundBox(BoundBox)
 	  </UserDocu>
     </Documentation>
+    <Methode Name="setVoid">
+      <Documentation>
+        <UserDocu>method setVoid()
+Invalidate the bounding box</UserDocu>
+      </Documentation>
+    </Methode>
+    <Methode Name="isValid">
+      <Documentation>
+        <UserDocu>method isValid()
+Checks if the bounding box is valid</UserDocu>
+      </Documentation>
+    </Methode>
     <Methode Name="add">
       <Documentation>
         <UserDocu>method add(BoundBox)
 Add (enlarge) the given BoundBox</UserDocu>
       </Documentation>
     </Methode>
-    <Methode Name="isIntersection">
+    <Methode Name="getPoint">
+      <Documentation>
+        <UserDocu>method getPoint(Int)
+Get the point of the given index. The index must be in the range of [0,7]
+        </UserDocu>
+      </Documentation>
+    </Methode>
+    <Methode Name="getEdge">
+      <Documentation>
+        <UserDocu>method getEdge(Int)
+Get the edge points of the given index. The index must be in the range of [0,11]
+        </UserDocu>
+      </Documentation>
+    </Methode>
+    <Methode Name="closestPoint">
       <Documentation>
-        <UserDocu>method isIntersection(Vector|BoundBox|Vector Base, Vector Dir)
+        <UserDocu>method closestPoint(Vector)
+Get the closest point of the bounding box to the given point
+        </UserDocu>
+      </Documentation>
+    </Methode>
+    <Methode Name="intersect">
+      <Documentation>
+        <UserDocu>method intersect(BoundBox|Vector Base, Vector Dir)
 Checks if the given object intersects with the BoundBox. That can be:
-- A Vector (Point)
 - Another BoundBox
 - A line, specified by Base and Dir
 		</UserDocu>
       </Documentation>
 	</Methode>
+    <Methode Name="intersected">
+      <Documentation>
+        <UserDocu>method intersected(BoundBox)
+Returns the intersection of this and the given bounding box.
+		</UserDocu>
+      </Documentation>
+	</Methode>
+    <Methode Name="united">
+      <Documentation>
+        <UserDocu>method united(BoundBox)
+Returns the union of this and the given bounding box.
+		</UserDocu>
+      </Documentation>
+	</Methode>
 	<Methode Name="enlarge">
 		<Documentation>
 			<UserDocu>method enlarge(Float)
@@ -62,11 +108,25 @@ exception is thrown.
 	  </Methode>
 	  <Methode Name="move">
 		  <Documentation>
-			  <UserDocu> method getIntersectionPoint(Vector)
+			  <UserDocu> method move(Vector)
 Move the BoundBox by the given vector
 			  </UserDocu>
 		  </Documentation>
 	  </Methode>
+	  <Methode Name="scale">
+		  <Documentation>
+			  <UserDocu> method scale(x,y,z)
+Scale the BoundBox by the given values in x, y and z
+			  </UserDocu>
+		  </Documentation>
+	  </Methode>
+	  <Methode Name="transformed">
+		  <Documentation>
+			  <UserDocu> method transformed(Matrix)
+Return a new bounding box with the transformed corner of this bounding box
+			  </UserDocu>
+		  </Documentation>
+	  </Methode>
 	  <Methode Name="isCutPlane">
       <Documentation>
         <UserDocu>method bool isCutPlane(Vector Base, Vector Normal)