From 654a6ac93513c3cc1ef97cacd782ff674c6f4559 Mon Sep 17 00:00:00 2001
From: Alexandre Marie <alexandre.marie@synchrotron-soleil.fr>
Date: Tue, 9 Jul 2019 10:20:20 +0200
Subject: New upstream version 0.11.0+dfsg

---
 silx/gui/plot3d/actions/mode.py | 61 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 6 deletions(-)

(limited to 'silx/gui/plot3d/actions')

diff --git a/silx/gui/plot3d/actions/mode.py b/silx/gui/plot3d/actions/mode.py
index b591290..ce09b4c 100644
--- a/silx/gui/plot3d/actions/mode.py
+++ b/silx/gui/plot3d/actions/mode.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 # /*##########################################################################
 #
-# Copyright (c) 2017-2018 European Synchrotron Radiation Facility
+# Copyright (c) 2017-2019 European Synchrotron Radiation Facility
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,8 @@
 # ###########################################################################*/
 """This module provides Plot3DAction related to interaction modes.
 
-It provides QAction to rotate or pan a Plot3DWidget.
+It provides QAction to rotate or pan a Plot3DWidget
+as well as toggle a picking mode.
 """
 
 from __future__ import absolute_import, division
@@ -36,7 +37,9 @@ __date__ = "06/09/2017"
 
 import logging
 
-from silx.gui.icons import getQIcon
+from ....utils.proxy import docstring
+from ... import qt
+from ...icons import getQIcon
 from .Plot3DAction import Plot3DAction
 
 
@@ -69,6 +72,7 @@ class InteractiveModeAction(Plot3DAction):
             plot3d.setInteractiveMode(self._interaction)
             self.setChecked(True)
 
+    @docstring(Plot3DAction)
     def setPlot3DWidget(self, widget):
         # Disconnect from previous Plot3DWidget
         plot3d = self.getPlot3DWidget()
@@ -86,9 +90,6 @@ class InteractiveModeAction(Plot3DAction):
             widget.sigInteractiveModeChanged.connect(
                 self._interactiveModeChanged)
 
-    # Reuse docstring from super class
-    setPlot3DWidget.__doc__ = Plot3DAction.setPlot3DWidget.__doc__
-
     def _interactiveModeChanged(self):
         plot3d = self.getPlot3DWidget()
         if plot3d is None:
@@ -127,3 +128,51 @@ class PanAction(InteractiveModeAction):
         self.setIcon(getQIcon('pan'))
         self.setText('Pan')
         self.setToolTip('Pan the view. Press <b>Ctrl</b> to rotate.')
+
+
+class PickingModeAction(Plot3DAction):
+    """QAction to toggle picking moe on a Plot3DWidget
+
+    :param parent: See :class:`QAction`
+    :param ~silx.gui.plot3d.Plot3DWidget.Plot3DWidget plot3d:
+        Plot3DWidget the action is associated with
+    """
+
+    sigSceneClicked = qt.Signal(float, float)
+    """Signal emitted when the scene is clicked with the left mouse button.
+
+    This signal is only emitted when the action is checked.
+
+    It provides the (x, y) clicked mouse position
+    """
+
+    def __init__(self, parent, plot3d=None):
+        super(PickingModeAction, self).__init__(parent, plot3d)
+        self.setIcon(getQIcon('pointing-hand'))
+        self.setText('Picking')
+        self.setToolTip('Toggle picking with left button click')
+        self.setCheckable(True)
+        self.triggered[bool].connect(self._triggered)
+
+    def _triggered(self, checked=False):
+        plot3d = self.getPlot3DWidget()
+        if plot3d is not None:
+            if checked:
+                plot3d.sigSceneClicked.connect(self.sigSceneClicked)
+            else:
+                plot3d.sigSceneClicked.disconnect(self.sigSceneClicked)
+
+    @docstring(Plot3DAction)
+    def setPlot3DWidget(self, widget):
+        # Disconnect from previous Plot3DWidget
+        plot3d = self.getPlot3DWidget()
+        if plot3d is not None and self.isChecked():
+            plot3d.sigSceneClicked.disconnect(self.sigSceneClicked)
+
+        super(PickingModeAction, self).setPlot3DWidget(widget)
+
+        # Connect to new Plot3DWidget
+        if widget is None:
+            self.setChecked(False)
+        elif self.isChecked():
+            widget.sigSceneClicked.connect(self.sigSceneClicked)
-- 
cgit v1.2.3