Env fix (#65)

* initial changes to choropleth layer

* updates in choropleth for efficient loading and legend

* changes based on review

* Add multiselect choices for tables

* Format black

* Revert "Format black"

This reverts commit de1732d.

* Fix example

* Fix cht_tiling

* small fixes in choropleth mapbox layer

* updated loading per zoom level in point and choro layers

* small correction to avoid error messase for noselection tables

* added favicon.ico in the served folder

* fixed most legend issues (#42)

* added second option for choropleth coloring (#44)

* small change in units in choropleths legend (#45)

* Env fix mvo (#43)

* fixed most legend issues

still need more generic way

* major changes in mapbox layers and tableview

allow for same layer js function in both main.js and mapbox_compare.js
table renamed to tableview

* more guitares updates

added mapbox_simple (will probably remove that later)
popup windows can get optional id
made layers a bit more robust

* allow value to be a string (format: yyyymmdd HHMMSS) in datetimeedit elements

* added icons for cyclone track layer

* just some formatting changes

* fixed visibility issue for choropleth layer

* finished cyclone_track_layer

* removed mapbox simple

also stopped mapbox from being loaded if it is made invisible by a dependency

* updated marker layer and changed names of nearly all layer modules and js files

* removed svg files

* now using resource file for arrows

* fixed popup width and height

* correct choropleth redrawing

---------

Co-authored-by: Panos <[email protected]>

* added coloring configuration for choropleths (#48)

* add functionality to have option as variable in radiobuttons (#50)

* add functionality to have option as variable in radiobuttons

* small correction

* Add column selection

* Add class callbacks

* Add variable deleting

* Add okay method checking

* Fix header selection in column selection

* Change hardcoded bins to loop

* Fix tiling cht in pyproject.toml

* Add new icons

* added server icons paths in pyproject.toml

* Added more custom coloring of layers (#60)

* start of custom coloring of points

* Implemented custom coloring of points

* first implementation of custom polygon layers

* speed up determining the column width

* Small bug

* test pushadd additional_attribute layer

* add polygon_layer_additional_attr

* Custom coloring of circle layer also possible for big_data = True

* add display circle layer

* remove display circle layer custom

* Fixed small bug not displaying points

* For now removing the legend in the if-statements, still to be implemented

* add units to hovering proprties

* made width of columns in table view flexible

---------

Co-authored-by: sarah.rautenbach <[email protected]>
Co-authored-by: Panos Athanasiou <[email protected]>

---------

Co-authored-by: Daley Adrichem <[email protected]>
Co-authored-by: dladrichem <[email protected]>
Co-authored-by: Maarten van Ormondt <[email protected]>
Co-authored-by: frederique-hub <[email protected]>
Co-authored-by: sarah.rautenbach <[email protected]>

Author: 5 people

examples/table/table.yml

@@ -3,7 +3,7 @@ window:
   width: 200
   height: 200
   module: callbacks
-  variable_group: table
+  variable_group: table  
 element:
 - style: table
   position:
@@ -17,6 +17,7 @@ element:
   option_value:
     variable: dataframe
   method: select
+  selection_type: 'SingleSelection'
 - style: text
   position:
     x: 20

pyproject.toml

@@ -25,13 +25,18 @@ dependencies = [
     "pyyaml",
     "pyqt5",
     "pyqtwebengine",
+    "cht_tiling @ git+https://github.com/Deltares-research/cht_tiling.git",
+    "datashader",
+    "spatialpandas",
+    "pyogrio"
 ]
 
 [tool.setuptools.package-data]
 "guitares.pyqt5.mapbox.server"    = ["*.js", "*.html"]
 "guitares.pyqt5.mapbox.server.js" = ["*.js"]
 "guitares.pyqt5.mapbox.server.js.img" = ["*.png"]
 "guitares.pyqt5.mapbox.server.css" = ["*.css"]
+"guitares.pyqt5.mapbox.server.icons" = ["*.png"]
 
 [project.urls]
 "Homepage" = "https://github.com/Deltares/Guitares"

src/guitares/element.py

@@ -75,6 +75,9 @@ def __init__(self, dct, parent, window):
         self.fraction_collapsed = 1.0
         self.fraction_expanded = 0.5
         self.multiselection = False
+        self.sortable = True
+        self.selection_type = "single"
+        self.ready = False
 
         # Now update element attributes based on dict
 
@@ -107,10 +110,28 @@ def __init__(self, dct, parent, window):
              self.callback = self.method
         else:
             if self.module and self.method:
-                if hasattr(self.module, self.method):
-                    self.callback = getattr(self.module, self.method)
-                else:
-                    print("Error! Could not find method " + self.method)
+                try:
+                    # Start with the base module
+                    module = self.module
+                    # If the method contains a dot, it means that it is a method of a class
+                    method_path = self.method.split(".")
+                    # Loop through the method path
+                    for idx, method in enumerate(method_path):
+                        # The last element is the method itself
+                        if idx == len(method_path) - 1:
+                            if hasattr(module, method):
+                                self.callback = getattr(module, method)
+                            else:
+                                raise Exception("Error! Could not find method " + self.method + " in module " + self.module.__name__)
+                        else:
+                            if hasattr(module, method):
+                                class_ = getattr(module, method)
+                                # Initialize the class object
+                                module = class_()
+                            else:
+                                raise Exception("Error! Could not find method " + self.method + " in module " + self.module.__name__)
+                except Exception as e:
+                    print(e)
         if self.variable_group in self.gui.variables:
             if self.variable in self.gui.variables[self.variable_group]:
                 self.type = type(self.gui.variables[self.variable_group][self.variable]["value"])
@@ -188,7 +209,13 @@ def __init__(self, dct, parent, window):
             self.multiselection = dct["multiselection"]
         if "enable" in dct:
             self.enable = dct["enable"]
-
+        if "selection_type" in dct:
+            self.selection_type = dct["selection_type"]
+        if "selection_direction" in dct:
+            self.selection_direction = dct["selection_direction"]
+        if "sortable" in dct:
+            self.sortable = dct["sortable"]
+            
         if "dependency" in dct:
             for dep in dct["dependency"]:
                 dependency = Dependency()
@@ -227,8 +254,9 @@ def __init__(self, dct, parent, window):
                     try:
                         if tab_dct["module"]:
                             tab.module = importlib.import_module(tab_dct["module"])
-                    except:
+                    except Exception as e:
                         print("Error! Module " + tab_dct["module"] + " could not be imported!")
+                        print(e)
                 self.tabs.append(tab)
 
     def add(self):
@@ -272,9 +300,9 @@ def add(self):
             from .pyqt5.listbox import ListBox
             self.widget = ListBox(self)
 
-        elif self.style == "table":
-            from .pyqt5.table import Table
-            self.widget = Table(self)
+        elif self.style == "tableview":
+            from .pyqt5.tableview import TableView
+            self.widget = TableView(self)
 
         elif self.style == "checkbox":
             from .pyqt5.checkbox import CheckBox
@@ -297,12 +325,30 @@ def add(self):
             self.widget = PushSaveFile(self)
 
         elif self.style == "mapbox":
-            from .pyqt5.mapbox.mapbox import MapBox
-            self.widget = MapBox(self)
+            # We don't want to add the mapbox widget if set to invisible, because it takes a long time to load.
+            # This means that widgets that are originally set to invisible will not be added to the GUI!
+            okay = True
+            if self.dependencies:
+                for dep in self.dependencies:
+                    if dep.action == "visible":
+                        if not dep.get():
+                            okay = False
+            if okay:                
+                from .pyqt5.mapbox.mapbox import MapBox
+                self.widget = MapBox(self)
 
         elif self.style == "mapbox_compare":
-            from .pyqt5.mapbox.mapbox_compare import MapBoxCompare
-            self.widget = MapBoxCompare(self)
+            # We don't want to add the mapbox widget if set to invisible, because it takes a long time to load.
+            # This means that widgets that are originally set to invisible will not be added to the GUI!
+            okay = True
+            if self.dependencies:
+                for dep in self.dependencies:
+                    if dep.action == "visible":
+                        if not dep.get():
+                            okay = False
+            if okay:                
+                from .pyqt5.mapbox.mapbox_compare import MapBoxCompare
+                self.widget = MapBoxCompare(self)
 
         elif self.style == "webpage":
             from .pyqt5.webpage import WebPage

src/guitares/gui.py

@@ -12,6 +12,8 @@
 from guitares.window import Window
 from guitares.server import start_server
 
+import guitares.icons_rc
+
 class GUI:
     def __init__(self, module,
                  framework="pyqt5",
@@ -25,6 +27,7 @@ def __init__(self, module,
                  server_nodejs=False,
                  js_messages=True,
                  copy_mapbox_server_folder=True,
+                 icon_path=None,
                  mapbox_token_file="mapbox_token.txt"):
 
         self.module      = module
@@ -43,7 +46,8 @@ def __init__(self, module,
         self.server_thread = None
         self.server_nodejs = server_nodejs
         self.js_messages = js_messages
-        self.popup_data = None
+        self.popup_window = {}
+        self.popup_data   = {}
         self.resize_factor = 1.0        
 
         QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts)
@@ -70,6 +74,7 @@ def __init__(self, module,
                     shutil.rmtree(server_path)
                 # Now copy over folder from mapbox
                 shutil.copytree(mpboxpth, server_path)
+
             # Read mapbox token and store in js file in server path
             if os.path.exists(os.path.join(self.config_path, mapbox_token_file)):
                 fid = open(os.path.join(self.config_path, mapbox_token_file), "r")
@@ -78,7 +83,16 @@ def __init__(self, module,
                 fid = open(os.path.join(server_path, "mapbox_token.js"), "w")
                 fid.write("mapbox_token = '" + mapbox_token[0].strip() + "';")
                 fid.close()
-            start_server(server_path, port=server_port, node=self.server_nodejs)    
+
+            if icon_path:
+                # Copy all files in icon_path to server_path/icons
+                if not os.path.exists(os.path.join(server_path, "icons")):
+                    os.mkdir(os.path.join(server_path, "icons"))
+                for file in os.listdir(icon_path):
+                    if file.endswith(".png"):
+                        shutil.copy(os.path.join(icon_path, file), os.path.join(server_path, "icons", file))
+
+            start_server(server_path, port=server_port, node=self.server_nodejs)
 
     def show_splash(self):
         if self.framework == "pyqt5" and self.splash_file:
@@ -124,14 +138,23 @@ def setvar(self, group, name, value):
 
     def getvar(self, group, name):
         if group not in self.variables:
-            print("Error! GUI variable group '" + group + "' not defined !")
+            print("Error! Cannot get variable! GUI variable group '" + group + "' not defined!")
             return None
         elif name not in self.variables[group]:
-            print("Error! GUI variable '" + name + "' not defined in group '" + group + "'!")
+            print("Error! Cannot get variable! GUI variable '" + name + "' not defined in group '" + group + "'!")
             return None
         return self.variables[group][name]["value"]
+    
+    def delvar(self, group, name):
+        if group not in self.variables:
+            print("Error! Cannot delete variable! GUI variable group '" + group + "' not defined!")
+            return None
+        elif name not in self.variables[group]:
+            print("Error! Cannot delete variable! GUI variable '" + name + "' not defined in group '" + group + "'!")
+            return None
+        del self.variables[group][name]
 
-    def popup(self, config, data=None):
+    def popup(self, config, id="popup", data=None):
         # Make pop-up window
         # config needs to be file name of yml file, or configuration dict
         # Data is optional and can have any shape (e.g. dict, str, object, etc.)
@@ -141,15 +164,16 @@ def popup(self, config, data=None):
             file_name = os.path.basename(config)
             config = self.read_gui_config(path, file_name)
         if data:    
-            self.popup_data = copy.copy(data)
+            self.popup_data[id] = copy.copy(data)
         else:
-            self.popup_data = None    
-        self.popup_window = Window(config, self, type="popup")
-        p = self.popup_window.build()
+            self.popup_data[id] = None    
+        self.popup_window[id] = Window(config, self, type="popup")
+        p = self.popup_window[id].build()
         okay = False
         if p.result() == 1:
             okay = True
-            data = self.popup_data
+            data = self.popup_data[id]
+        # Remove popup window and data    
         return okay, data
 
     def read_gui_config(self, path, file_name):

src/guitares/icons.qrc

@@ -0,0 +1,39 @@
+<!DOCTYPE RCC>
+<!-- Build with: pyrcc5 icons.qrc -o icons_rc.py -->
+<RCC version="1.0">
+    <qresource>
+        <file>img/category_1_hurricane_icon_24x48.png</file>
+        <file>img/category_2_hurricane_icon_24x48.png</file>
+        <file>img/category_3_hurricane_icon_24x48.png</file>
+        <file>img/category_4_hurricane_icon_24x48.png</file>
+        <file>img/category_5_hurricane_icon_24x48.png</file>
+        <file>img/icons8-triangle-arrow-24_white_right.png</file>
+        <file>img/icons8-triangle-arrow-24_white_left.png</file>
+        <file>img/icons8-triangle-arrow-24_black_right.png</file>
+        <file>img/icons8-triangle-arrow-24_black_left.png</file>
+        <file>img/icons8-triangle-arrow-24_black_up.png</file>
+        <file>img/icons8-triangle-arrow-24_black_down.png</file>
+        <file>img/icons8-triangle-arrow-16_white_right.png</file>
+        <file>img/icons8-triangle-arrow-16_white_left.png</file>
+        <file>img/icons8-triangle-arrow-16_white_up.png</file>
+        <file>img/icons8-triangle-arrow-16_white_down.png</file>
+        <file>img/white_up_48x48.png</file>
+        <file>img/white_right_48x48.png</file>
+        <file>img/white_down_48x48.png</file>
+        <file>img/white_left_48x48.png</file>
+        <file>img/black_up_48x48.png</file>
+        <file>img/black_right_48x48.png</file>
+        <file>img/black_down_48x48.png</file>
+        <file>img/black_left_48x48.png</file>
+        <file>img/mapbox-marker-icon-20px-blue.png</file>
+        <file>img/mapbox-marker-icon-20px-gray.png</file>
+        <file>img/mapbox-marker-icon-20px-green.png</file>
+        <file>img/mapbox-marker-icon-20px-orange.png</file>
+        <file>img/mapbox-marker-icon-20px-pink.png</file>
+        <file>img/mapbox-marker-icon-20px-purple.png</file>
+        <file>img/mapbox-marker-icon-20px-red.png</file>
+        <file>img/mapbox-marker-icon-20px-yellow.png</file>
+        <file>img/tide_icon_48x48.png</file>
+        <file>img/tropical_storm_icon_24x48.png</file>
+    </qresource>
+</RCC>