Browse Source

wxGUI: fix 'wxPyDeprecationWarning: Call to deprecated item. Use FindItem instead.' (#1344)

Tomas Zigo 4 years ago
parent
commit
181260833d

+ 2 - 2
gui/wxpython/gcp/manager.py

@@ -1267,7 +1267,7 @@ class GCP(MapFrame, ColumnSorterMixin):
 
 
         # update key and GCP number
         # update key and GCP number
         for newkey in range(key, len(self.mapcoordlist)):
         for newkey in range(key, len(self.mapcoordlist)):
-            index = self.list.FindItemData(-1, newkey + 1)
+            index = self.list.FindItem(-1, newkey + 1)
             self.mapcoordlist[newkey][0] = newkey
             self.mapcoordlist[newkey][0] = newkey
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItemData(index, newkey)
             self.list.SetItemData(index, newkey)
@@ -2484,7 +2484,7 @@ class GCPList(ListCtrl,
 
 
     def OnColClick(self, event):
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)
                           wx.LIST_STATE_SELECTED)

+ 1 - 1
gui/wxpython/gcp/statusbar.py

@@ -61,7 +61,7 @@ class SbGoToGCP(SbItem):
         listCtrl = self.mapFrame.GetListCtrl()
         listCtrl = self.mapFrame.GetListCtrl()
 
 
         listCtrl.selectedkey = gcpNumber
         listCtrl.selectedkey = gcpNumber
-        listCtrl.selected = listCtrl.FindItemData(-1, gcpNumber)
+        listCtrl.selected = listCtrl.FindItem(-1, gcpNumber)
         listCtrl.render = False
         listCtrl.render = False
         listCtrl.SetItemState(listCtrl.selected,
         listCtrl.SetItemState(listCtrl.selected,
                               wx.LIST_STATE_SELECTED,
                               wx.LIST_STATE_SELECTED,

+ 2 - 2
gui/wxpython/image2target/ii2t_manager.py

@@ -1233,7 +1233,7 @@ class GCP(MapFrame, ColumnSorterMixin):
 
 
         # update key and GCP number
         # update key and GCP number
         for newkey in range(key, len(self.mapcoordlist)):
         for newkey in range(key, len(self.mapcoordlist)):
-            index = self.list.FindItemData(-1, newkey + 1)
+            index = self.list.FindItem(-1, newkey + 1)
             self.mapcoordlist[newkey][0] = newkey
             self.mapcoordlist[newkey][0] = newkey
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItemData(index, newkey)
             self.list.SetItemData(index, newkey)
@@ -2405,7 +2405,7 @@ class GCPList(ListCtrl,
 
 
     def OnColClick(self, event):
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)
                           wx.LIST_STATE_SELECTED)

+ 1 - 1
gui/wxpython/image2target/ii2t_statusbar.py

@@ -61,7 +61,7 @@ class SbGoToGCP(SbItem):
         listCtrl = self.mapFrame.GetListCtrl()
         listCtrl = self.mapFrame.GetListCtrl()
 
 
         listCtrl.selectedkey = gcpNumber
         listCtrl.selectedkey = gcpNumber
-        listCtrl.selected = listCtrl.FindItemData(-1, gcpNumber)
+        listCtrl.selected = listCtrl.FindItem(-1, gcpNumber)
         listCtrl.render = False
         listCtrl.render = False
         listCtrl.SetItemState(listCtrl.selected,
         listCtrl.SetItemState(listCtrl.selected,
                               wx.LIST_STATE_SELECTED,
                               wx.LIST_STATE_SELECTED,

+ 2 - 2
gui/wxpython/photo2image/ip2i_manager.py

@@ -614,7 +614,7 @@ class GCP(MapFrame, ColumnSorterMixin):
 
 
         # update key and GCP number
         # update key and GCP number
         for newkey in range(key, len(self.mapcoordlist)):
         for newkey in range(key, len(self.mapcoordlist)):
-            index = self.list.FindItemData(-1, newkey + 1)
+            index = self.list.FindItem(-1, newkey + 1)
             self.mapcoordlist[newkey][0] = newkey
             self.mapcoordlist[newkey][0] = newkey
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItem(index, 0, str(newkey))
             self.list.SetItemData(index, newkey)
             self.list.SetItemData(index, newkey)
@@ -1711,7 +1711,7 @@ class GCPList(ListCtrl,
 
 
     def OnColClick(self, event):
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)
                           wx.LIST_STATE_SELECTED)

+ 1 - 1
gui/wxpython/photo2image/ip2i_statusbar.py

@@ -61,7 +61,7 @@ class SbGoToGCP(SbItem):
         listCtrl = self.mapFrame.GetListCtrl()
         listCtrl = self.mapFrame.GetListCtrl()
 
 
         listCtrl.selectedkey = gcpNumber
         listCtrl.selectedkey = gcpNumber
-        listCtrl.selected = listCtrl.FindItemData(-1, gcpNumber)
+        listCtrl.selected = listCtrl.FindItem(-1, gcpNumber)
         listCtrl.render = False
         listCtrl.render = False
         listCtrl.SetItemState(listCtrl.selected,
         listCtrl.SetItemState(listCtrl.selected,
                               wx.LIST_STATE_SELECTED,
                               wx.LIST_STATE_SELECTED,

+ 2 - 2
gui/wxpython/vnet/widgets.py

@@ -303,7 +303,7 @@ class PointsList(ListCtrl,
 
 
         # update key and point number
         # update key and point number
         for newkey in range(key, len(self.itemDataMap)):
         for newkey in range(key, len(self.itemDataMap)):
-            index = self.FindItemData(-1, newkey + 1)
+            index = self.FindItem(-1, newkey + 1)
             self.itemDataMap[newkey][0] = newkey
             self.itemDataMap[newkey][0] = newkey
             self.SetItem(index, 0, str(newkey + 1))
             self.SetItem(index, 0, str(newkey + 1))
             self.SetItemData(index, newkey)
             self.SetItemData(index, newkey)
@@ -418,7 +418,7 @@ class PointsList(ListCtrl,
 
 
     def OnColClick(self, event):
     def OnColClick(self, event):
         """ListCtrl forgets selected item..."""
         """ListCtrl forgets selected item..."""
-        self.selected = self.FindItemData(-1, self.selectedkey)
+        self.selected = self.FindItem(-1, self.selectedkey)
         self.SetItemState(self.selected,
         self.SetItemState(self.selected,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED,
                           wx.LIST_STATE_SELECTED)
                           wx.LIST_STATE_SELECTED)