Fix bug on multi selection end command

Author: mboscolo

PythonCAD/Generic/Kernel/Command/basecommand.py

@@ -39,7 +39,7 @@ def __init__(self, document):
         self.index=0
         self.document=document
         self.automaticApply=True
-
+        self.autorestart=True
     def __iter__(self):
         return self
 
@@ -153,7 +153,7 @@ def keys(self):
     @property
     def lenght(self):
         """
-            get the number of command imput value that the user have to provide
+            get the number of command input value that the user have to provide
         """
         return len(self.exception)
 

PythonCAD/Generic/Kernel/Command/propertycommand.py

@@ -31,6 +31,7 @@ class PropertyCommand(BaseCommand):
     """
     def __init__(self, document):
         BaseCommand.__init__(self, document)
+        self.autorestart=False
         self.exception=[ExcMultiEntity,ExcDicTuple]
         self.defaultValue=[None]
         self.message=["Select Entities: ", 

PythonCAD/Generic/Kernel/GeoUtil/geolib.py

@@ -23,6 +23,7 @@
 import math
 
 from Kernel.GeoEntity.point  import Point
+from Kernel.exception import EntityMissing
 
 class Vector:
     """
@@ -33,9 +34,9 @@ def __init__(self,p1,p2):
             Default Constructor
         """
         if(not isinstance(p1,Point)):
-          raise TypeError,"Invalid Argument p1: Point Required"
+            raise EntityMissing("Invalid Argument p1: Point Required")
         if(not isinstance(p2,Point)):
-          raise TypeError,"Invalid Argument p2: Point Required"
+            raise EntityMissing("Invalid Argument p2: Point Required")
         x,y=p1.getCoords()
         x1,y1=p2.getCoords()
         self.X=x1-x

PythonCAD/Generic/Kernel/exception.py

@@ -21,6 +21,16 @@
 #
 # This  module Provide custom exception for the db module and kernel
 #
+class EntityMissing(Exception):
+    """
+        Wrong entity provided
+    """
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+    
+    
 class NoDefaultValue(Exception):
     """
         no default value provided by the command

PythonCAD/Interface/Command/icommand.py

@@ -23,19 +23,10 @@
 #
 # How it works:
 #
-#
-#
-#Qt Import
-#
-from PyQt4 import QtCore, QtGui
-
-import math, string
+import logging
 #
 #Kernel Import
 #
-from Kernel.initsetting             import SNAP_POINT_ARRAY, ACTIVE_SNAP_POINT, ACTIVE_SNAP_LIST
-from Kernel.GeoEntity.point         import Point
-from Kernel.GeoUtil.geolib          import Vector
 from Kernel.GeoUtil.intersection    import *
 from Kernel.pycadevent              import *
 from Kernel.exception               import *
@@ -44,7 +35,6 @@
 # Interface Import
 #
 from Interface.cadinitsetting       import RESTART_COMMAND_OPTION
-from Interface.Entity.base          import BaseEntity
 from Interface.Dialogs.property     import Property
 from Interface.Preview.factory      import *
 from Interface.DrawingHelper.snap   import *
@@ -114,14 +104,16 @@ def addMauseEvent(self, point, entity,distance=None,angle=None , text=None, forc
         #
         # Compute snap distance and position force
         #
-        #print "log: addMauseEvent", str(point), str(entity), str(distance), str(angle), str(text), str(force)
+        logging.debug("log: addMauseEvent [%s][%s][%s][%s][%s][%s]"%( str(point), str(entity), str(distance), str(angle), str(text), str(force)))
         if correct!=None:
             snap=self.scene.snappingPoint.getSnapPoint(point,self.getEntity(point))
             snap=self.correctPositionForcedDirection(snap, self._scene.forceDirection)
         else:
             snap=point
+            
         if angle==None:
             angle=self.calculateAngle(snap)
+            
         if distance==None:
             distance=self.getDistance(snap)
         #
@@ -212,25 +204,28 @@ def applyCommand(self):
         self.scene.hideSnapMarks()
         try:
             self.kernelCommand.applyCommand()
-            if RESTART_COMMAND_OPTION:
-                self.restartCommand()
-                self.updateInput(self.kernelCommand.activeMessage)
-                self.scene.clearSelection()
-                self.scene.fromPoint=None
-                self.scene.isGuided=None
-                self.scene.isGuideLocked=None
-                self.scene.GuideHandler.reset()
+            if RESTART_COMMAND_OPTION and self.kernelCommand.autorestart:
+                    self.restartCommand()
+                    self.updateInput(self.kernelCommand.activeMessage)
+                    self.scene.clearSelection()
+                    self.scene.fromPoint=None
+                    self.scene.isGuided=None
+                    self.scene.isGuideLocked=None
+                    self.scene.GuideHandler.reset()
             else:
                 self.scene.cancelCommand()
                 self.updateInput("Ready")
+                self.scene.clearPreview()
+                self.removePreviewItemToTheScene()
                 self=None
+                return
             self.scene.clearPreview()
+            self.removePreviewItemToTheScene()
         except Exception as e:
             print type(e)     # the exception instance
             print "ICommand applyCommand Errore ", str(e)
             self.restartCommand()
-        self.removePreviewItemToTheScene()
-        return
+
 
     def getEntity(self, position):
         """
@@ -283,14 +278,16 @@ def calculateAngle(self, snap):
         """
         if snap==None:
             return None
-
-        for snapPoint in self._snap:
-            print "angle ",self._snap[snapPoint],snap 
-            v=Vector(self._snap[snapPoint],snap )
-            return v.absAng
-        else:
+        try:
+            for snapPoint in self._snap:
+                print "angle ",self._snap[snapPoint],snap 
+                v=Vector(self._snap[snapPoint],snap )
+                return v.absAng
+            else:
+                return None
+        except EntityMissing:
             return None
-
+        
     def decodeText(self, value):
         """
             encode the text given from the user

PythonCAD/Interface/Dialogs/Widget/widgets.py

@@ -86,8 +86,8 @@ def penChanged(self):
         """
             change event 
         """
-        self.activeValue = QtCore.Qt.PenStyle(self.penStyleComboBox.itemData(
-                self.penStyleComboBox.currentIndex(), IdRole))
+        value=self.penStyleComboBox.currentIndex()
+        self.activeValue = QtCore.Qt.PenStyle(self.penStyleComboBox.itemData(value, IdRole).toInt()[0])
         self.changed=True