Changeset c6fb57c in sasview for src

Timestamp:

Nov 22, 2017 7:49:06 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

cb4d219

Parents:

0580c77

Message:

Add "delete" to the data explorer context menu

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (3 diffs)
• UI/DataExplorerUI.ui (modified) (1 diff)
• UnitTesting/DataExplorerTest.py (modified) (3 diffs, 1 prop)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -858 +858 @@
         self.context_menu.addAction(self.actionQuick3DPlot)
         self.context_menu.addAction(self.actionEditMask)
+        self.context_menu.addSeparator()
+        self.context_menu.addAction(self.actionDelete)
+
 
         # Define the callbacks
@@ -865 +868 @@
         self.actionQuick3DPlot.triggered.connect(self.quickData3DPlot)
         self.actionEditMask.triggered.connect(self.showEditDataMask)
+        self.actionDelete.triggered.connect(self.deleteItem)
 
     def onCustomContextMenu(self, position):
@@ -996 +1000 @@
         mask_editor.exec_()
 
+    def deleteItem(self):
+        """
+        Delete the current item
+        """
+        # Assure this is indeed wanted
+        delete_msg = "This operation will delete the selected data sets." +\
+                     "\nDo you want to continue?"
+        reply = QtWidgets.QMessageBox.question(self,
+                                           'Warning',
+                                           delete_msg,
+                                           QtWidgets.QMessageBox.Yes,
+                                           QtWidgets.QMessageBox.No)
+
+        if reply == QtWidgets.QMessageBox.No:
+            return
+
+        indices = self.current_view.selectedIndexes()
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+
+        for index in indices:
+            row_index = proxy.mapToSource(index)
+            item_to_delete = model.itemFromIndex(row_index)
+            if item_to_delete.isCheckable():
+                row = row_index.row()
+                if item_to_delete.parent():
+                    # We have a child item - delete from it
+                    item_to_delete.parent().removeRow(row)
+                else:
+                    # delete directly from model
+                    model.removeRow(row)
+        pass
+
     def loadComplete(self, output):
         """

src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui

@@ -499 +499 @@
    </property>
   </action>
+  <action name="actionDelete">
+   <property name="text">
+    <string>Delete</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -26 +26 @@
 import sas.qtgui.Plotting.PlotHelper as PlotHelper
 
-if not QApplication.instance():
-    app = QApplication(sys.argv)
+#if not QApplication.instance():
+app = QApplication(sys.argv)
 
 class DataExplorerTest(unittest.TestCase):
@@ -684 +684 @@
         self.form.treeView.customContextMenuRequested.emit(rect)
 
-        # app.exec_() # debug
-
         # See that the menu has been shown
         self.form.context_menu.exec_.assert_called_once()
@@ -805 +803 @@
         pass
 
+    def notestDeleteItem(self):
+        """
+        Delete selected item from data explorer
+        """
+
+        # Mock the confirmation dialog with return=No
+        QMessageBox.question = MagicMock(return_value=QMessageBox.No)
+
+        # Populate the model
+        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "cyl_400_20.txt"]
+        self.form.readData(filename)
+
+        # Assure the model contains three items
+        self.assertEqual(self.form.model.rowCount(), 3)
+
+        # Add an item to first file item
+        item1 = QtGui.QStandardItem("test")
+        item1.setCheckable(True)
+        self.form.model.item(0).appendRow(item1)
+
+        # Check the new item is in
+
+        self.assertTrue(self.form.model.item(0).hasChildren())
+
+        #select_item = self.form.model.item(0).child(3)
+        select_item = self.form.model.item(0)
+        select_index = self.form.model.indexFromItem(select_item)
+
+        # Open up items
+        self.form.current_view.expandAll()
+
+        # Select the newly created item
+        self.form.current_view.selectionModel().select(select_index, QtCore.QItemSelectionModel.Rows)
+
+        # Attempt at deleting
+        self.form.deleteItem()
+
+        # Test the warning dialog called once
+        self.assertTrue(QMessageBox.question.called)
+
+        # Assure the model still contains the items
+        self.assertEqual(self.form.model.rowCount(), 3)
+
+        # Now, mock the confirmation dialog with return=Yes
+        QMessageBox.question = MagicMock(return_value=QMessageBox.Yes)
+
+        # Select the newly created item
+        self.form.current_view.selectionModel().select(select_index, QtCore.QItemSelectionModel.Rows)
+        # delete it. now for good
+        self.form.deleteItem()
+
+        # Test the warning dialog called once
+        self.assertTrue(QMessageBox.question.called)
+
+        # Assure the model contains no items
+        self.assertEqual(self.form.model.rowCount(), 3)
+
 
 if __name__ == "__main__":