Fixed Edge inheritance issue

tpaviot · tpaviot · commit dcf1435b972b · 2015-08-14T19:28:33.000+02:00
diff --git a/OCCUtils/edge.py b/OCCUtils/edge.py
@@ -155,11 +155,19 @@ def approximate_on_surface(self):
         raise NotImplementedError
 
 
-class Edge(KbeObject, TopoDS_Edge):
+class Edge(TopoDS_Edge, KbeObject):
     def __init__(self, edge):
         assert isinstance(edge, TopoDS_Edge), 'need a TopoDS_Edge, got a %s' % edge.__class__
+        assert not edge.IsNull()
+        super(Edge, self).__init__()
         KbeObject.__init__(self, 'edge')
-        TopoDS_Edge.__init__(self, edge)
+        # we need to copy the base shape using the following three
+        # lines
+        assert self.IsNull()
+        self.TShape(edge.TShape())
+        self.Location(edge.Location())
+        self.Orientation(edge.Orientation())
+        assert not self.IsNull()
 
         # tracking state
         self._local_properties_init = False
@@ -547,3 +555,12 @@ def color(self, *rgb):
         '''color descriptor for the curve
         '''
         raise NotImplementedError
+
+if __name__ == '__main__':
+    from OCC.BRepPrimAPI import *
+    from Topology import Topo
+    b = BRepPrimAPI_MakeBox(10, 20, 30).Shape()
+    t = Topo(b)
+    ed = t.edges().next()
+    my_e = Edge(ed)
+    print(my_e.tolerance)
diff --git a/test/occutils_test.py b/test/occutils_test.py
@@ -23,9 +23,10 @@
 sys.path.append('../OCCUtils')
 
 from OCC.BRepPrimAPI import BRepPrimAPI_MakeBox
-from OCC.TopoDS import TopoDS_Face
+from OCC.TopoDS import TopoDS_Face, TopoDS_Edge
 
 from Topology import Topo
+from edge import Edge
 
 
 def get_test_box_shape():
@@ -47,6 +48,15 @@ def test_loop_faces(self):
             assert(isinstance(face, TopoDS_Face))
         assert(i == 6)
 
+    def test_loop_edges(self):
+        b = get_test_box_shape()
+        t = Topo(b)
+        i = 0
+        for face in t.edges():
+            i += 1
+            assert(isinstance(face, TopoDS_Edge))
+        assert(i == 12)
+
     def test_get_numbers_of_members(self):
         b = get_test_box_shape()
         t = Topo(b)
@@ -60,9 +70,24 @@ def test_get_numbers_of_members(self):
         assert(t.number_of_comp_solids() == 0)
 
 
+class TestEdge(unittest.TestCase):
+    def test_creat_edge(self):
+        # create a box
+        b = get_test_box_shape()
+        # take the first edge
+        t = Topo(b)
+        edge_0 = t.edges().next()  # it's a TopoDS_Edge
+        assert not edge_0.IsNull()
+        # then create an edge
+        my_Edge = Edge(edge_0)
+        assert not my_Edge.IsNull()
+        assert my_Edge.tolerance == 1e-06
+
+
 def suite():
     test_suite = unittest.TestSuite()
     test_suite.addTest(unittest.makeSuite(TestTopo))
+    test_suite.addTest(unittest.makeSuite(TestEdge))
     return test_suite
 
 if __name__ == "__main__":
