Improve snap performance by excluding intersection with non geoItems

Generic fix

Author: mboscolo

PythonCAD/Generic/Kernel/GeoEntity/dimension.py

@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2002, 2003, 2004, 2005, 2006 Art Haas
 #
-# Copyright (c) 2010 Matteo Boscolo
+# Copyright (c) 2010 - 2013 Matteo Boscolo
 #
 # This file is part of PythonCAD.
 #

PythonCAD/Generic/Kernel/GeoEntity/geometricalentity.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010 Matteo Boscolo
+# Copyright (c) 2010 - 2013 Matteo Boscolo
 #
 # This file is part of PythonCAD.
 #
@@ -132,7 +132,7 @@ class GeometricalEntityComposed(dict):
         like dimension labels ...
     """
     def __init__(self, kw, argNameType):
-        if kw is None and argNameType is none:
+        if kw is None and argNameType is None:
             return
         if len(kw)!=len(argNameType):
             raise TypeError, "Wrong number of items "

PythonCAD/Generic/Kernel/GeoUtil/intersection.py

@@ -135,7 +135,7 @@ def _pol_obj_intersection(ipts, pol, obj):
     """
     for seg in pol.getSegments():
         tempIpts=[]
-        _sympy_intersection(tempipts,  seg,  obj)
+        _sympy_intersection(tempIpts,  seg,  obj)
         if len(tempIpts)>0:
             ipts=tempIpts
             break
@@ -149,7 +149,7 @@ def _pol_pol_intersection(ipts, pol1, pol2):
             for seg1 in pol1.getSegments():
                 for seg2 in pol2.getSegments():
                     tempIpts=[]
-                    _sympy_intersection(tempipts,  seg1,  seg2)
+                    _sympy_intersection(tempIpts,  seg1,  seg2)
                     if len(tempIpts)>0:
                         ipts=tempIpts
                         break
@@ -173,7 +173,7 @@ def find_intersections(obja, objb):
             try:
                 _sympy_intersection(_ipts, obja, objb)
             except:
-                print "problem with sympy intersection"
+                print "find_intersections: problem with sympy intersection",obja,objb
     return _ipts
 
 def findSegmentExtendedIntersection(obja, objb):

PythonCAD/Generic/Kernel/exception.py

@@ -188,49 +188,49 @@ class ExcPoint(CommandException):
 
 class ExcLenght(CommandException):
     """
-        when this exception is trown it means that the command need a lenght
+        when this exception is thrown it means that the command need a lenght
     """
     pass
 
 class ExcAngle(CommandException):
     """
-        when this exception is trown it means that the command need a deg angle
+        when this exception is thrown it means that the command need a deg angle
     """
     pass
 
 class ExcText(CommandException):
     """
-        when this exception is trown it means that the command need text
+        when this exception is thrown it means that the command need text
     """
     pass
 
 class ExcInt(CommandException):
     """
-        when this exception is trown it means that the command need an Integer
+        when this exception is thrown it means that the command need an Integer
     """
     pass
 
 class ExcBool(CommandException):
     """
-        when this exception is trown it means that the command need an Boolean
+        when this exception is thrown it means that the command need n Boolean
     """
     pass
 
 class ExcEntity(CommandException):
     """
-        when this exception is trown it means that the command need an dbEnity
+        when this exception is thrown it means that the command need n dbEnity
     """
     pass
 
 class ExcMultiEntity(CommandException):
     """
-        when this exception is trown it means that the command need an array of id
+        when this exception is thrown it means that the command need an array of id
     """
     pass
 
 class ExcEntityPoint(CommandException):
     """
-        when this exception is trown it means that the command need an a string
+        when this exception is thrown it means that the command need an a string
         like id@x,y
     """
     pass

PythonCAD/Interface/Command/icommand.py

@@ -500,7 +500,7 @@ def correctPositionForcedDirection(self, point, force):
 
     def getIntersection(self, entity, point):
         """
-            this fucnticion compute the  snap intersection point
+            this function compute the  snap intersection point
         """
         returnVal=None
         distance=None

PythonCAD/Interface/DrawingHelper/polarguides.py

@@ -51,7 +51,9 @@ def __init__(self, parent, x, y, a):
 
         self.addGuidesByIncrement(math.pi/6)
 
-        
+    def collidesWithItem(self,other,mode):
+        return False
+            
     def setForceDirection(self, a):
         '''
         set scene.forceDirection to a angle
@@ -151,6 +153,8 @@ def __init__(self, parent=None, a=0.0):
 
         self.setPen(self.hidePen)
         self.hide()
+    def collidesWithItem(self,other,mode):
+        return False
 
     def hide(self):
         self.setPen(self.hidePen)

PythonCAD/Interface/DrawingHelper/snap.py

@@ -43,28 +43,32 @@ def getSnapPoint(self,  point, entity):
             fromPoint:  [Geoent.Pointfloat]
             fromEnt:    [GeoEnt.*]
         """
+        def pointReturn(pointCalculated,realPoint):
+            if pointCalculated==None:
+                return realPoint
+            return pointCalculated
+            
         if self.activeSnap==SNAP_POINT_ARRAY["NONE"]:
             return point
         else:
             snapPoint=point
             if SNAP_POINT_ARRAY["MID"] == self.activeSnap:
-                snapPoint = self.getSnapMiddlePoint(entity)
+                return pointReturn(self.getSnapMiddlePoint(entity),point)
             elif SNAP_POINT_ARRAY["END"] == self.activeSnap:
-                snapPoint =self.getSnapEndPoint(entity, point)
+                return pointReturn(self.getSnapEndPoint(entity, point),point)
             elif SNAP_POINT_ARRAY["ORTHO"] == self.activeSnap:
-                snapPoint =self.getSnapOrtoPoint(entity, point)
+                return pointReturn(self.getSnapOrtoPoint(entity, point),point)
             elif SNAP_POINT_ARRAY["CENTER"]== self.activeSnap:
-                snapPoint =self.getSnapCenterPoint(entity)
+                return pointReturn(self.getSnapCenterPoint(entity),point)
             elif SNAP_POINT_ARRAY["QUADRANT"]== self.activeSnap:
-                snapPoint =self.getSnapQuadrantPoint(entity, snapPoint)
+                return pointReturn(self.getSnapQuadrantPoint(entity, snapPoint),point)
             elif SNAP_POINT_ARRAY["ORIG"]== self.activeSnap:
-                snapPoint=Point(0.0, 0.0)
+                return Point(0.0, 0.0)
             elif SNAP_POINT_ARRAY["INTERSECTION"]== self.activeSnap:
-                snapPoint=self.getIntersection(entity,snapPoint )
+                return pointReturn(self.getIntersection(entity,snapPoint ),point)
             elif SNAP_POINT_ARRAY["LIST"]== self.activeSnap:
-                #this should be used when checklist of snap will be enabled
+                #TODO: this should be used when checklist of snap will be enabled
                 snapPoints=[]
-
                 if ACTIVE_SNAP_LIST.count(SNAP_POINT_ARRAY["MID"])>0:
                     pnt=self.getSnapMiddlePoint(entity)
                     if pnt!=None:
@@ -102,14 +106,12 @@ def getSnapPoint(self,  point, entity):
                 else:
                     if outPoint[0]!=None:
                         snapPoint=outPoint[0]
+            return pointReturn(snapPoint,point)
 
-            if snapPoint==None:
-                return point
-            return snapPoint
 
     def getSnapOrtoPoint(self, entity, point):
         """
-            this fucnticion compute the orto to point snap constraint
+            this function compute the orto to point snap constraint
         """
         # Now only works for segments and arcs. USES THE getPROJECTION METHOD
         if self._scene.fromPoint==None or entity == None:
@@ -125,7 +127,7 @@ def getSnapOrtoPoint(self, entity, point):
 
     def getSnapTangentPoint(self, point):
         """
-            this fucnticion compute the Tangent to point snap constraint
+            this function compute the Tangent to point snap constraint
         """
         #TODO: getSnapTangentPoint
         returnVal=None
@@ -136,7 +138,7 @@ def getSnapTangentPoint(self, point):
 
     def getSnapMiddlePoint(self, entity):
         """
-            this fucnticion compute midpoint snap constraint to the entity argument
+            this function compute midpoint snap constraint to the entity argument
         """
         returnVal=None
         if getattr(entity, 'geoItem', None):
@@ -146,7 +148,7 @@ def getSnapMiddlePoint(self, entity):
 
     def getSnapEndPoint(self, entity, point):
         """
-            this fucnticion compute the  snap endpoint
+            this function compute the  snap endpoint
         """
         if point == None or entity == None:
             return None
@@ -166,7 +168,7 @@ def getSnapEndPoint(self, entity, point):
 
     def getSnapCenterPoint(self, entity):
         """
-            this fucnticion compute the  snap from the center of an entity
+            this function compute the  snap from the center of an entity
         """
         returnVal=None
         if getattr(entity, 'geoItem', None):
@@ -179,22 +181,17 @@ def getSnapCenterPoint(self, entity):
 
     def getIntersection(self, entity, point):
         """
-            this fucnticion compute the  snap intersection point
+            this function compute the  snap intersection point
         """
         returnVal=None
         distance=None
         if entity!=None:
             geoEntityFrom=entity.geoItem
-            import time
-            #startTime=time.clock()
             entityList=self._scene.collidingItems(entity)
-            #endTime=time.clock()-startTime
-            #print "getIntersection, collidingItems in %s"%str(endTime)
-            #startTime=time.clock()
             for ent in entityList:
+                if not isinstance(ent,BaseEntity):
+                    continue
                 if isinstance(ent, BaseEntity):
-                    #print "geoitem", ent.geoItem
-                    #print "geoEntityFrom", geoEntityFrom
                     intPoint=find_intersections(ent.geoItem,geoEntityFrom)
                     for tp in intPoint:
                         iPoint=Point(tp[0], tp[1])
@@ -206,13 +203,11 @@ def getIntersection(self, entity, point):
                             if distance>spoolDist:
                                 distance=spoolDist
                                 returnVal=iPoint
-            #endTime=time.clock()-startTime
-            #print "find intersection in %s"%str(endTime)
         return returnVal
 
     def getSnapQuadrantPoint(self, entity, point):
         """
-            this fucnticion compute the  snap from the quadrant
+            this function compute the  snap from the quadrant
         """
         returnVal=None
         if getattr(entity, 'geoItem', None):
@@ -244,7 +239,10 @@ def __init__(self):
         self.setFlag(QtGui.QGraphicsItem.ItemIsSelectable, False)
         self.setFlag(QtGui.QGraphicsItem.ItemIgnoresTransformations, True)
         self.hide()
-
+    
+    def collidesWithItem(self,other,mode):
+        return False
+    
     def shape(self):
         """
             overloading of the shape method
@@ -277,7 +275,11 @@ def __init__(self, x, y):
         self.setToolTip("EndPoint")
         self.x=x
         self.y=y
-
+    
+    def collidesWithItem(self,other,mode):
+        print "collidesWithItem"
+        return False
+    
     def definePath(self):
         rect=QtCore.QRectF(self.x-5.0, self.y-5.0, 10.0, 10.0)
         path=QtGui.QPainterPath()

PythonCAD/pythoncad_qt.py

@@ -24,6 +24,7 @@
 from Interface.cadwindow    import CadWindowMdi
 #
 def getPythonCAD():
+
     app = QtGui.QApplication(sys.argv)
     # splashscreen
     splashPath=os.path.join(os.getcwd(), 'icons', 'splashScreen1.png')