wxGUI datacatalog: Add multiple GRASS databases #761

lindakarlovska · 2020-07-02T13:59:15Z

Currently, only the current database is in the GUI datacatalog. To make this more useful, user needs to be able to add additional ones.

petrasovaa · 2020-07-02T17:14:44Z

You don't want to create a new database here, the goal is to add an existing database (meaning existing directory with locations (or possibly empty)). It should behave like the Browse button in the current start up screen.

petrasovaa · 2020-07-03T01:47:53Z

gui/wxpython/datacatalog/tree.py

        if node.data['type'] == 'grassdb':
            font.SetWeight(wx.FONTWEIGHT_BOLD)
        elif node.data['type'] in ('location', 'mapset'):
-            if node in (self.current_location_node, self.current_mapset_node):
+            if node in (self.current_grassdb_node, self.current_location_node, self.current_mapset_node):
                font.SetWeight(wx.FONTWEIGHT_BOLD)


This part needs to be fixed, it would highlight all grassdbs

petrasovaa · 2020-07-03T02:01:26Z

gui/wxpython/datacatalog/tree.py

+    def _popupMenuGrassDb(self):
+        """Create popup menu for grass db"""
+        raise NotImplementedError()
+


Instead create empty menu, it should not throw error.

petrasovaa · 2020-07-03T02:02:10Z

gui/wxpython/datacatalog/tree.py

+    def CreateGrassDb(self):
+        "Create new grass database"
+        root = self._model.root
+
+        dlg = NewGrassDbDialog(
+            parent=self,
+        )
+        if dlg.ShowModal() == wx.ID_OK:
+            db = dlg.GetValue()
+            try:
+                create_database_directory(db)
+            except OSError as err:
+                GError(parent=self,
+                       message=_("Unable to create new grass database: %s") % err,
+                       showTraceback=False)
+            self.InsertGrassDb(name=db,
+                               root_node=root)


petrasovaa · 2020-07-03T02:04:45Z

gui/wxpython/datacatalog/toolbars.py

-                                      self.OnSetRestriction, wx.ITEM_CHECK)
+                                      self.OnSetRestriction, wx.ITEM_CHECK),
+                                     ("createGrassDb", icons['locked'],
+                                      self.parent.OnCreateGrassDb)


This should call something like OnAddGrassDB which opens a standard file dialog to select a directory and then inserts the new node and reloads data.

petrasovaa · 2020-07-03T02:05:57Z

None of the changes outside of datacatalog/ dir should be needed.

petrasovaa · 2020-07-04T01:31:42Z

gui/wxpython/datacatalog/toolbars.py

+    def MakeButton(self, text, id=wx.ID_ANY, size=(-1, -1),
+                   parent=None, tooltip=None):
+        """Generic button"""
+        if not parent:
+            parent = self
+        button = Button(parent=parent, id=id, label=text,
+                        size=size)
+        if tooltip:
+            button.SetToolTip(tooltip)
+        return button
+


Remove, this should be a toolbar button, not a standard button.

petrasovaa · 2020-07-04T02:08:20Z

You need to fix OnGetItemFont and OnGetItemImage. Since you call RefreshNode on root, and root doesn't have type, it fails.
Another problem is that the initial db is added without a name, so SearchNodes in GetCurrentDbLocationMapsetNode fails.
What is still missing is reloading the content of the newly added database, for now reloading everything will work (ReloadTreeItems). For future we need more sophisticated reloading of only the newly added database.

petrasovaa · 2020-07-04T03:29:14Z

I added a new icon grassdb-add to master, so you can rebase to master and use that icon.

petrasovaa · 2020-07-05T18:15:04Z

gui/icons/grass/grassdb-add.svg

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>


Don't remove this file from the repository.

petrasovaa · 2020-07-05T18:40:02Z

gui/wxpython/datacatalog/tree.py

        self._orig_model = self._model
+        self._model.SortChildren(self._model.root)


Why sort here?

petrasovaa · 2020-07-05T18:41:24Z

gui/wxpython/datacatalog/tree.py

@@ -407,7 +416,7 @@ def get_first_child(node):
        p = Process(
            target=getLocationTree,
            args=(
-                genv['GISDBASE'],
+                self.selected_grassdb[0],


use self.current_grassdb_node

petrasovaa · 2020-07-06T01:46:37Z

gui/wxpython/datacatalog/tree.py

        else:
-            self.changeLocation.emit(mapset=self.selected_mapset[0].label, location=self.selected_location[0].label)
-        self.UpdateCurrentLocationMapsetNode()
+            self.changeGrassDb.emit(mapset=self.selected_mapset[0].label,


Changing to location in the same or in a different db is the same, so changeGrassDb is not needed, just use changeLocation but add the grassdb parameter.

How do you mean that? grassdb is not the parameter in changeLocation function, I need to add it but I do not know how. I sought in signal.py but I think you have meant it differently.

Search for changeLocation.connect, that's how signal handlers are called.

petrasovaa · 2020-07-06T01:52:06Z

gui/wxpython/datacatalog/tree.py

+    def InsertGrassDb(self, name):
+        """Insert grass db into model and refresh tree"""
+        self._model.SortChildren(self._model.root)
+        self.ReloadTreeItems()
+


As I tried to explain, this should still add the node because in the future you would add a function to reload just the db here. Also add the db here to _grassdatabases. Call ReloadTreeItems from the OnAddDB handler.

petrasovaa · 2020-07-06T01:55:58Z

gui/wxpython/datacatalog/toolbars.py

@@ -32,6 +32,9 @@
    'locked': MetaIcon(
        img='locked',
        label=_("Click to allow editing other mapsets")),
+    'addGrassDB': MetaIcon(
+        img='grassdb-add',
+        label=_("Click to add new grass database"))


uppercase GRASS

… functions edited especially GetCurrentDbLocationMapsetNode, OnSwitchDbLocationMapset,_isCurrent. Added InsertGrassDb function. Added OnCreateGrassDb to DataCatalogToolbar. create_database_directory was made more general in order to draw up NewGrassDbDialog class with exceptions.

…atacatalog/ dir are needed. Function OnAddGrassDB created that called function InsertGrassDb.

…ction ReloadTreeItems. Added toolbar button with particular image.

…l selected db, location and mapset. OnGetItemFont function changed.

… edited.

gui/wxpython/datacatalog/tree.py

petrasovaa

Generally, delete prints, run flake8. More specific comments are in the code.

petrasovaa · 2020-07-10T01:48:47Z

gui/wxpython/datacatalog/tree.py

            gisrc2, env2 = gscript.create_environment(
-                            gisenv()['GISDBASE'], self.copy_location[i].label, mapset=self.copy_mapset[i].label)
+                            self.selected_grassdb[i].label,


self.copy_grassdb[i].label

petrasovaa · 2020-07-10T02:05:35Z

gui/wxpython/datacatalog/tree.py

-                                  mapset=self.selected_mapset[0].label):
+
+            if self.selected_grassdb[0] == self.copy_grassdb[i]:
+                if self.selected_location[0] == self.copy_location[i]:


The point of the condition here is to test if you are copying/moving map in a different location, in that case you need to reproject. If it's within the same location you don't need to reproject. If the location is in a different database, that doesn't make difference, you still need to reproject. So just remove that test you added.

petrasovaa · 2020-07-10T02:08:17Z

gui/wxpython/datacatalog/tree.py

@@ -761,7 +798,7 @@ def OnPasteMap(self, event):
                                                   element=self.copy_layer[i].data['type'])
                    if not new_name:
                        continue
-                gisdbase = gisenv()['GISDBASE']
+                gisdbase = self.selected_grassdb[0]


Here you need to distinguish between the database from where we reproject and to which database we reproject.

petrasovaa · 2020-07-10T02:13:25Z

gui/wxpython/datacatalog/tree.py

@@ -499,6 +516,8 @@ def OnRightClick(self, node):
            self._popupMenuMapset()
        elif self.selected_location[0] and not self.selected_mapset[0] and len(self.selected_location) == 1:
            self._popupMenuLocation()
+        elif self.selected_grassdb[0] and not self.selected_location[0] and not self.selected_mapset[0] and len(self.selected_grassdb) == 1:


and not self.selected_mapset[0] is redundant

I meant that only for the line starting elif self.selected_grassdb[0]

petrasovaa · 2020-07-10T02:18:05Z

gui/wxpython/datacatalog/frame.py

+        if dlg.ShowModal() == wx.ID_OK:
+            grassdatabase = dlg.GetPath()
+            self.tree.InsertGrassDb(name=grassdatabase)
+            self.tree.ReloadTreeItems()


I think we in the end decided to put reloadtreeitems in insertgrassdb

petrasovaa · 2020-07-10T02:20:49Z

gui/wxpython/datacatalog/tree.py

        self._orig_model = self._model
        self._model.RemoveNode(self._model.root)
        self.InitTreeItems()
-        self.UpdateCurrentLocationMapsetNode()
+        self.UpdateCurrentDbLocationMapsetNode()


Move this at the end of _initTreeItems just before RefreshItems so that is is properly refreshed.

lindakarlovska · 2020-07-10T16:51:37Z

After sixth commit:
Switching to mapset in different grassdb still does not work. Do not know how to add grassdb parameter to self.changeLocation.emit

petrasovaa · 2020-07-10T17:27:47Z

Copying between different databases doesn't work, you need to provide 2 grassdb to CatalogReprojectionDialog

…ching between two GRASS db still does not work. Than copying of layers in CatalogReprojectionDialog corrected. OnRightClick function also edited.

lindakarlovska · 2020-07-11T09:18:20Z

Copying between different databases doesn't work, you need to provide 2 grassdb to CatalogReprojectionDialog

I have corrected this but still have a problem with the switching between databases. There is the same error as when we tried to switch to current mapset in #771:

No not know how to figure that out.

petrasovaa · 2020-07-11T18:02:32Z

Copying between different databases doesn't work, you need to provide 2 grassdb to CatalogReprojectionDialog

I have corrected this but still have a problem with the switching between databases. There is the same error as when we tried to switch to current mapset in #771:

No not know how to figure that out.

You also need to fix it in lmgr/frame.py

petrasovaa · 2020-07-11T18:03:01Z

gui/wxpython/datacatalog/frame.py

-                                         self.ChangeLocationMapset(location=location,
+        self.tree.changeLocation.connect(lambda mapset, location, dbase:
+                                         self.ChangeDbLocationMapset(dbase=dbase,
+                                                                   location=location,


fix indentation

petrasovaa · 2020-07-11T18:07:31Z

gui/wxpython/datacatalog/frame.py

+                                   "Current location is <%(loc)s>.\n"
+                                   "Current mapset is <%(mapset)s>."
+                                   ) %
+                         {'dbase': dbase, 'loc': location, 'mapset': mapset})
        if location:


if dbase and location are passed, it's switching twice

…rrected.

lindakarlovska marked this pull request as draft July 2, 2020 14:09

petrasovaa reviewed Jul 3, 2020

View reviewed changes

petrasovaa closed this Jul 3, 2020

petrasovaa reopened this Jul 3, 2020

petrasovaa added gsoc Reserved for Google Summer of Code student(s) GUI wxGUI related labels Jul 3, 2020

petrasovaa added this to In progress in New GUI Startup via automation Jul 3, 2020

petrasovaa linked an issue Jul 3, 2020 that may be closed by this pull request

[Feat] wxGUI datacatalog: Add multiple GRASS databases #741

Closed

petrasovaa reviewed Jul 4, 2020

View reviewed changes

wenzeslaus mentioned this pull request Jul 4, 2020

init: Start in last used mapset with --gui like --text #767

Merged

7 tasks

lindakarlovska force-pushed the wxGUI-datacatalog-Add-multiple-GRASS-databases branch from 071734e to 300fee1 Compare July 5, 2020 05:22

petrasovaa reviewed Jul 5, 2020

View reviewed changes

petrasovaa reviewed Jul 6, 2020

View reviewed changes

lindakladivova added 5 commits July 9, 2020 04:54

Add Button for browsing existing db. None of the changes outside of d…

0ef2832

…atacatalog/ dir are needed. Function OnAddGrassDB created that called function InsertGrassDb.

wxGUI/datacatalog: Changed function InitTreeItems and associative fun…

c3eee93

…ction ReloadTreeItems. Added toolbar button with particular image.

wxGUI/datacatalog: Corrected function initTreeItems to display initia…

f5e051c

…l selected db, location and mapset. OnGetItemFont function changed.

wxGUI/datacatalog: Icon grassdb-add.svg added. Function InsertGrassDb…

223a72c

… edited.

lindakarlovska force-pushed the wxGUI-datacatalog-Add-multiple-GRASS-databases branch from daef1fe to 223a72c Compare July 9, 2020 12:21

petrasovaa reviewed Jul 10, 2020

View reviewed changes

gui/wxpython/datacatalog/tree.py Show resolved Hide resolved

petrasovaa reviewed Jul 10, 2020

View reviewed changes

wxGUI/datacatalog: Moved some functions and made several smaller edits.

b691684

wxGUI/datacatalog: ChangeDbLocationMapset in frame.py edited but swit…

7edea0a

…ching between two GRASS db still does not work. Than copying of layers in CatalogReprojectionDialog corrected. OnRightClick function also edited.

wxGUI/datacatalog: Flake8 corrected.

97a2faa

petrasovaa reviewed Jul 11, 2020

View reviewed changes

lindakladivova and others added 3 commits July 12, 2020 04:00

wxGUI/datacatalog: lmgr/frame.py edited and ChangeDbLocationMapset co…

157cd43

…rrected.

wxGUI/datacatalog: Flake8 corrected.

9d08a46

fixes after review and testing, flake8 fixes

db17e46

petrasovaa marked this pull request as ready for review July 13, 2020 02:32

petrasovaa merged commit 423ccab into OSGeo:master Jul 13, 2020

New GUI Startup automation moved this from In progress to Done Jul 13, 2020

neteler added this to the 8.0.0 milestone Dec 9, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wxGUI datacatalog: Add multiple GRASS databases #761

wxGUI datacatalog: Add multiple GRASS databases #761

lindakarlovska commented Jul 2, 2020 •

edited

Loading

petrasovaa commented Jul 2, 2020

petrasovaa Jul 3, 2020

petrasovaa Jul 3, 2020

petrasovaa Jul 3, 2020

petrasovaa Jul 3, 2020

petrasovaa commented Jul 3, 2020

petrasovaa Jul 4, 2020

petrasovaa commented Jul 4, 2020

petrasovaa commented Jul 4, 2020

petrasovaa Jul 5, 2020

petrasovaa Jul 5, 2020

petrasovaa Jul 5, 2020

petrasovaa Jul 6, 2020

lindakarlovska Jul 10, 2020

petrasovaa Jul 10, 2020

petrasovaa Jul 6, 2020

petrasovaa Jul 6, 2020

petrasovaa left a comment

petrasovaa Jul 10, 2020

petrasovaa Jul 10, 2020

petrasovaa Jul 10, 2020

petrasovaa Jul 10, 2020

petrasovaa Jul 10, 2020

petrasovaa Jul 10, 2020

petrasovaa Jul 10, 2020

lindakarlovska commented Jul 10, 2020

petrasovaa commented Jul 10, 2020

lindakarlovska commented Jul 11, 2020

petrasovaa commented Jul 11, 2020

petrasovaa Jul 11, 2020

petrasovaa Jul 11, 2020

		@@ -1,119 +0,0 @@
		<?xml version="1.0" encoding="UTF-8" standalone="no"?>

		self._orig_model = self._model
		self._model.SortChildren(self._model.root)

wxGUI datacatalog: Add multiple GRASS databases #761

wxGUI datacatalog: Add multiple GRASS databases #761

Conversation

lindakarlovska commented Jul 2, 2020 • edited Loading

petrasovaa commented Jul 2, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

petrasovaa commented Jul 3, 2020

Choose a reason for hiding this comment

petrasovaa commented Jul 4, 2020

petrasovaa commented Jul 4, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

petrasovaa left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lindakarlovska commented Jul 10, 2020

petrasovaa commented Jul 10, 2020

lindakarlovska commented Jul 11, 2020

petrasovaa commented Jul 11, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lindakarlovska commented Jul 2, 2020 •

edited

Loading