Merge branch 'bugfix-error_when_deleting_data_from_gui' into 'develop'

Bugfix error when deleting data from gui

See merge request !30

CHANGELOG

@@ -2,13 +2,14 @@ version 1.2.0
 --------------
 * ADDED issue #27 Better error handling when an error occurs when running an analysis from the GUI
 * ADDED issue #10 Implemented Gromacs trajectory converter
+* FIXED issue #26 Data can be deleted from the GUI
 * FIXED issue #25 The plotter is now compliant with all matplotlib versions (was crashing on ubuntu-xenial)
 * FIXED issue #25 The plotter is now compliant with all matplotlib versions (was crashing on ubuntu-xenial)
 * FIXED issue #21 "Save a template for new analysis" button produced an error
 * FIXED issue #20 Opening the theoretical help on MacOS is now OK
+* FIXED issue #16 The file filter combo box is now available from the input file dialog on MacOS
 * CHANGED (internal) MDANSE is now built with system python (2.7.10)
 
-
 version 1.1.3
 --------------
 * FIXED issue #19 Users could not display user definitions

MDANSE/GUI/DataController.py

@@ -74,4 +74,4 @@ class DataController(collections.OrderedDict):
 
         return (weakref.getweakrefcount(collections.OrderedDict.__getitem__(self,item))!=0)
 
-DATA_CONTROLLER = DataController()
\ No newline at end of file
+DATA_CONTROLLER = DataController()

MDANSE/GUI/DataTreePanel.py

@@ -98,10 +98,13 @@ class DataTreePanel(wx.Panel):
     def get_tree_item(self, node, name):
                 
         for item in self.get_children(node):
-            if self._tree.GetItemData(item).GetData() == name:
-                return item
-            else:
-                return self.get_tree_item(item, name)
+            data = self._tree.GetItemData(item)
+            if data is not None:
+                if data.GetData() == name:
+                    return item
+                else:
+                    continue
+            return self.get_tree_item(item, name)
         
         return None