Prechádzať zdrojové kódy

libraster: add support for GDAL 2.4 on MS Windows

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73835 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 6 rokov pred
rodič
commit
589bcab16a

+ 0 - 3
gui/wxpython/gui_core/menu.py

@@ -152,9 +152,6 @@ class SearchModuleWindow(wx.Panel):
         self._tree.SetToolTip(
         self._tree.SetToolTip(
             _("Double-click or Ctrl-Enter to run selected module"))
             _("Double-click or Ctrl-Enter to run selected module"))
 
 
-#        self._dataBox = wx.StaticBox(parent = self, id = wx.ID_ANY,
-#                                     label = " %s " % _("Module tree"))
-
         # search widget
         # search widget
         self._search = SearchModuleWidget(parent=self,
         self._search = SearchModuleWidget(parent=self,
                                           model=model,
                                           model=model,

+ 10 - 2
gui/wxpython/gui_core/treeview.py

@@ -112,16 +112,24 @@ class AbstractTreeViewMixin(VirtualTree):
         :param node: node representing item
         :param node: node representing item
         :param select: True/False to select/deselect
         :param select: True/False to select/deselect
         """
         """
+        print (node)
         index = self._model.GetIndexOfNode(node)
         index = self._model.GetIndexOfNode(node)
+
+        # expand parents
         for i in range(len(index))[1:]:
         for i in range(len(index))[1:]:
+            print (index[:i])
             item = self.GetItemByIndex(index[:i])
             item = self.GetItemByIndex(index[:i])
+            print (item, item.GetText())
             self.Expand(item)
             self.Expand(item)
             # needed for wxPython 3:
             # needed for wxPython 3:
-            self.EnsureVisible(item)
+            # self.EnsureVisible(item)
 
 
+        print (index)
         item = self.GetItemByIndex(index)
         item = self.GetItemByIndex(index)
+        print (item, item.GetText())
+        self.EnsureVisible(item)
         self.SelectItem(item, select)
         self.SelectItem(item, select)
-
+        
     def ExpandNode(self, node, recursive=True):
     def ExpandNode(self, node, recursive=True):
         """Expand items.
         """Expand items.
 
 

+ 0 - 3
gui/wxpython/gui_core/widgets.py

@@ -1073,9 +1073,6 @@ class SearchModuleWidget(wx.Panel):
 
 
         wx.Panel.__init__(self, parent=parent, id=wx.ID_ANY, **kwargs)
         wx.Panel.__init__(self, parent=parent, id=wx.ID_ANY, **kwargs)
 
 
-#        self._box = wx.StaticBox(parent = self, id = wx.ID_ANY,
-# label = " %s " % _("Find module - (press Enter for next match)"))
-
         if sys.platform == 'win32':
         if sys.platform == 'win32':
             self._search = TextCtrl(
             self._search = TextCtrl(
                 parent=self, id=wx.ID_ANY, size=(-1, 25),
                 parent=self, id=wx.ID_ANY, size=(-1, 25),

+ 3 - 3
gui/wxpython/modules/extensions.py

@@ -127,9 +127,9 @@ class InstallExtensionWindow(wx.Frame):
         # self.btnFetch.Bind(wx.EVT_BUTTON, self.OnFetch)
         # self.btnFetch.Bind(wx.EVT_BUTTON, self.OnFetch)
         self.btnInstall.Bind(wx.EVT_BUTTON, self.OnInstall)
         self.btnInstall.Bind(wx.EVT_BUTTON, self.OnInstall)
         self.btnHelp.Bind(wx.EVT_BUTTON, self.OnHelp)
         self.btnHelp.Bind(wx.EVT_BUTTON, self.OnHelp)
-        self.tree.selectionChanged.connect(self.OnItemSelected)
-        self.tree.itemActivated.connect(self.OnItemActivated)
-        self.tree.contextMenu.connect(self.OnContextMenu)
+        #self.tree.selectionChanged.connect(self.OnItemSelected)
+        #self.tree.itemActivated.connect(self.OnItemActivated)
+        #self.tree.contextMenu.connect(self.OnContextMenu)
 
 
         wx.CallAfter(self._fetch)
         wx.CallAfter(self._fetch)
 
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 5 - 5
lib/python/ctypes/ctypesgencore/parser/lextab.py


+ 1 - 0
lib/raster/gdal.c

@@ -115,6 +115,7 @@ static void load_library(void)
 	"libgdal1.7.0.so",
 	"libgdal1.7.0.so",
 # endif
 # endif
 # ifdef _WIN32
 # ifdef _WIN32
+	"gdal204.dll",        
 	"gdal203.dll",        
 	"gdal203.dll",        
 	"gdal202.dll",        
 	"gdal202.dll",        
 	"gdal201.dll",
 	"gdal201.dll",