Changes between Version 38 and Version 39 of PythonOcc/primitives

Timestamp:

Nov 6, 2015, 4:16:13 PM (9 years ago)

Author:

dpenko

Comment:

Uredil kodo za nov PythonOcc 0.16 pri "Izdelava zaokrožitev"

PythonOcc/primitives

@@ -453 +453 @@
 Knjižnica ukazov za izdelavo zaokrožitev se nahaja v viru BRepFilletAPI in jo je potrebno vključiti v program pred uporabo ukaza:
 {{{
-#!python
-from OCC.TopExp import*        
+#!python      
 from OCC.BRepFilletAPI import * 
-from OCC.Utils.Topology import *
+from OCC.TopExp import *
+from OCC.TopAbs import *
+from OCC.TopTools import *
+from OCC.TopoDS import *
+from OCC.TColgp import *
+from OCC.Display.OCCViewer import *
 }}}
 Pri apliciranju vseh vrst zaokrožitev je potrebno imeti podatek o robu oziroma točki kamor hočemo izvesti zaokrožitev ter o parametrih zaokrožitve (radij zaokrožitve).
@@ -469 +473 @@
 {{{
 #!python
-topology_traverser = Topo(Oblika)
-for aEdge in topology_traverser.edges():
-    zaokrozitev.Add(Radij , aEdge)
-#    zaokrozitev.Add(Radij_1, Radij_2 , aEdge)
+anEdgeExplorer = TopExp_Explorer(oblika, TopAbs_EDGE)
+
+    while anEdgeExplorer.More():
+        anEdge = topods.Edge(anEdgeExplorer.Current())
+        zaokrozitev.Add(Radij_1, anEdge)
+        #zaokrozitev.Add(Radij_1, Radij_2, anEdge)
+        anEdgeExplorer.Next()
+
+    zaokrozitev.Build()
+    oblika = zaokrozitev.Shape()
 }}}
 [[BR]][[BR]][[BR]][[BR]][[BR]][[BR]][[BR]][[BR]] [[Image(26.png, 300, right)]]
@@ -478 +488 @@
 {{{
 #!python
-for aEdge in topology_traverser.edges():
-    first, last = TopExp().FirstVertex(aEdge), TopExp().LastVertex(aEdge)
-    first_vert, last_vert = BRep_Tool().Pnt(first), BRep_Tool().Pnt(last)
-    if first_vert.Z() != last_vert.Z():
-        zaokrozitev.Add(Radij, aEdge)
+topExp = TopExp_Explorer()
+    topExp.Init(oblika, TopAbs_VERTEX)
+
+    # Vzamemo dve točki (two vertices)
+    vertA = topods_Vertex(topExp.Current())
+    topExp.Next()
+    vertB = topods_Vertex(topExp.Current())
+    anEdgeExplorer = TopExp_Explorer(oblika, TopAbs_EDGE)
+    while anEdgeExplorer.More():
+        edge = topods.Edge(anEdgeExplorer.Current())
+        first, last = topexp_FirstVertex(edge), topexp_LastVertex(edge)
+        vertex, first_vert, last_vert = BRep_Tool().Pnt(vertA), BRep_Tool().Pnt(first), BRep_Tool().Pnt(last)
+        if first_vert.Z() != last_vert.Z():
+            zaokrozitev.Add(Radij_1, edge)
+        anEdgeExplorer.Next()
+    afillet.Build()
+    oblika = afillet.Shape()
 }}}
 Pri izdelavi zaokrožitev moramo biti pozorni na velikost zaokrožitve. Vrednost zaokrožitve mora biti dovolj majhna da lahko normalno zaokrožimo robove.
@@ -523 +545 @@
 {{{
 #!python
-def vertex_fillet(oblika, tocka):
+def vertex_fillet(oblika, vert):
     afillet = BRepFilletAPI_MakeFillet(oblika)
     cnt = 0
-    for edg in topo.edges_from_vertex(tocka):
-        first, last = TopExp().FirstVertex(edg), TopExp().LastVertex(edg)
-        vertex, first_vert, last_vert = BRep_Tool().Pnt(tocka), BRep_Tool().Pnt(first), BRep_Tool().Pnt(last)
-        if edg.Orientation():
+    # Iz točk najdemo robove
+    _map = TopTools_IndexedDataMapOfShapeListOfShape()
+    topexp_MapShapesAndAncestors(oblika, TopAbs_VERTEX, TopAbs_EDGE, _map)
+    results = _map.FindFromKey(vert)
+    topology_iterator = TopTools_ListIteratorOfListOfShape(results)
+    while topology_iterator.More():
+        edge = topods_Edge(topology_iterator.Value())
+        topology_iterator.Next()
+        first, last = topexp_FirstVertex(edge), topexp_LastVertex(edge)
+        vertex, first_vert, last_vert = BRep_Tool().Pnt(vert), BRep_Tool().Pnt(first), BRep_Tool().Pnt(last)
+        if edge.Orientation():
             if not vertex.IsEqual(first_vert, 0.001):
-                afillet.Add(Radij_1, Radij_2, Rob)
+                afillet.Add(0, 20., edge)
             else:
-                afillet.Add(Radij_1, Radij_2, Rob)
-            cnt+=1
+                afillet.Add(20, 0, edge)
+        cnt += 1
     afillet.Build()
     if afillet.IsDone():