Merge branch 'master' into feature/holding-tags-copy

src/Mod/AddonManager/Resources/AddonManager.qrc

@@ -15,6 +15,7 @@
         <file>icons/CurvedShapes_workbench_icon.svg</file>
         <file>icons/Curves_workbench_icon.svg</file>
         <file>icons/Defeaturing_workbench_icon.svg</file>
+        <file>icons/DesignSPHysics_workbench_icon.svg</file>
         <file>icons/dodo_workbench_icon.svg</file>
         <file>icons/DynamicData_workbench_icon.svg</file>
         <file>icons/EM_workbench_icon.svg</file>

src/Mod/Arch/ArchSectionPlane.py

@@ -1133,6 +1133,19 @@ def doubleClicked(self,vobj):
 
         self.setEdit(vobj,None)
 
+    def setupContextMenu(self,vobj,menu):
+        """CONTEXT MENU setup"""
+        from PySide import QtCore,QtGui
+        action1 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_Edit.svg"),"Toggle Cutview",menu)
+        action1.triggered.connect(lambda f=self.contextCutview, arg=vobj:f(arg))
+        menu.addAction(action1)
+
+    def contextCutview(self,vobj):
+        """CONTEXT MENU command to toggle CutView property on and off"""
+        if vobj.CutView:
+            vobj.CutView = False
+        else: vobj.CutView = True        
+
 
 class _ArchDrawingView:
 

src/Mod/Draft/DraftEdit.py

@@ -41,6 +41,20 @@
     from PySide import QtCore
     from PySide.QtCore import QT_TRANSLATE_NOOP
     from DraftTools import translate
+
+    COLORS = {
+        "default": FreeCADGui.draftToolBar.getDefaultColor("snap"),
+        "black":  (0., 0., 0.),
+        "white":  (1., 1., 1.),
+        "grey":   (.5, .5, .5),
+        "red":    (1., 0., 0.),
+        "green":  (0., 1., 0.),
+        "blue":   (0., 0., 1.),
+        "yellow": (1., 1., 0.),
+        "cyan":   (0., 1., 1.),
+        "magenta":(1., 0., 1.)
+    }
+
 
 class Edit():
 
@@ -49,6 +63,7 @@ class Edit():
     def __init__(self):
         self.running = False
         self.trackers = {'object':[]}
+        self.overNode = None # preselected node with mouseover
         self.obj = None
         self.editing = None
 
@@ -271,8 +286,18 @@ def mouseMoved(self, event_callback):
         if self.editing != None:
             self.updateTrackerAndGhost(event)
         else:
-            # TODO add preselection color change for trackers
-            pass
+            # look for a node in mouse position and highlight it
+            pos = event.getPosition()
+            node = self.getEditNode(pos)
+            ep = self.getEditNodeIndex(node)
+            if ep != None: 
+                if self.overNode != None: self.overNode.setColor(COLORS["default"])
+                self.trackers[str(node.objectName.getValue())][ep].setColor(COLORS["red"])
+                self.overNode = self.trackers[str(node.objectName.getValue())][ep]
+            else:
+                if self.overNode != None:
+                    self.overNode.setColor(COLORS["default"])
+                    self.overNode = None
 
     def startEditing(self, event):
         "start editing selected EditNode"

src/Mod/Draft/DraftTrackers.py

@@ -709,11 +709,11 @@ class editTracker(Tracker):
     """A node edit tracker"""
     def __init__(self,pos=Vector(0,0,0),name=None,idx=0,objcol=None,\
             marker=FreeCADGui.getMarkerIndex("quad", 9),inactive=False):
-        color = coin.SoBaseColor()
+        self.color = coin.SoBaseColor()
         if objcol:
-            color.rgb = objcol[:3]
+            self.color.rgb = objcol[:3]
         else:
-            color.rgb = FreeCADGui.draftToolBar.getDefaultColor("snap")
+            self.color.rgb = FreeCADGui.draftToolBar.getDefaultColor("snap")
         self.marker = coin.SoMarkerSet() # this is the marker symbol
         self.marker.markerIndex = marker
         self.coords = coin.SoCoordinate3() # this is the coordinate
@@ -729,7 +729,7 @@ def __init__(self,pos=Vector(0,0,0),name=None,idx=0,objcol=None,\
                 selnode.subElementName.setValue("EditNode"+str(idx))
         node = coin.SoAnnotation()
         selnode.addChild(self.coords)
-        selnode.addChild(color)
+        selnode.addChild(self.color)
         selnode.addChild(self.marker)
         node.addChild(selnode)
         ontop = not inactive
@@ -746,6 +746,12 @@ def get(self):
     def move(self,delta):
         self.set(self.get().add(delta))
 
+    def setColor(self,color):
+        if color:
+            self.color.rgb = color
+        else:
+            self.color.rgb = FreeCADGui.draftToolBar.getDefaultColor("snap")
+
 class PlaneTracker(Tracker):
     """A working plane tracker"""
     def __init__(self):