[NERLPLANNER] Upgrade pysimplegui to 5.0

leondavi · Jul 5, 2024 · b34c2b5 · b34c2b5
1 parent a7f91dd
commit b34c2b5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src_erl/NerlnetApp/src/nerlnetApp_app.erl b/src_erl/NerlnetApp/src/nerlnetApp_app.erl
@@ -20,8 +20,8 @@
 -behaviour(application).
 -include("nerl_tools.hrl").
 
--define(NERLNET_APP_VERSION, "1.5.0").
--define(NERLPLANNER_TESTED_VERSION,"1.0.2").
+-define(NERLNET_APP_VERSION, "1.5.1").
+-define(NERLPLANNER_TESTED_VERSION,"1.0.3").
 
 -export([start/2, stop/1]).
 

diff --git a/src_py/nerlPlanner/Definitions.py b/src_py/nerlPlanner/Definitions.py
@@ -1,8 +1,8 @@
 import subprocess
 from logger import *
 
-VERSION = "1.0.2"
-NERLNET_VERSION_TESTED_WITH = "1.5.0"
+VERSION = "1.0.3"
+NERLNET_VERSION_TESTED_WITH = "1.5.1"
 NERLNET_TMP_PATH = "/tmp/nerlnet"
 NERLNET_GRAPHVIZ_OUTPUT_DIR = f"{NERLNET_TMP_PATH}/nerlplanner"
 NERLNET_GLOBAL_PATH = "/usr/local/lib/nerlnet-lib/NErlNet"
@@ -13,6 +13,7 @@
 WINDOW_FIXED_WIDTH = 1500
 WINDOW_MAX_SUPPORTED_HEIGHT = 1080 # smaller than 1080 is better
 WINDOW_HEIGHT_MULTIPLICATION_FACTOR =  5/6
+PYSIMPLEGUI_5_LICENSE = 'eby6JRM5a8WmNGlnbWnUN2l0VVHilawWZaSoIK6hIUkdRGpPcG3YR7ygaLWlJ015dxG7lUvfbRijI0s6IIkfxbplYD2XVhuCc220VFJIR7CUIy68MXTAcxyBMRDUIYxKONTYATwXM3S7w5iQT4GWlMjaZUWV5pzfZbUjR1lcc6GIxOvWe8Wm1elIbvn3RUWjZDXRJtzHa4Wo9PuEIVjgokiENISn47wvI0iowVieTlm5F4tDZOUFZapUcenANX0AImjSoni1RPGtFO2taaW7QGidLXCwJ7OgYuWz1zloTkG5FWzVddCWIw6UItkwxIl0bV2o4liLLfCGJvDiby2z1fwkYYWW5u5fIGjsoRiZTemkVXy1bHGS5kljdRChIRsdIqkJNL1rcG3rRHvHbcWAVgyUS5UgQkihO5i0IDy1OEDDkF4uMzCtISszIukTRhhqdCG5VSJUcz3LNN1vZTWoQYi4OrifISyoMuDAIF02LGTBA736LMTMAu2sI4icwSidRxGmFF0cZ5UMVG4ucMGclkyOZQXPMXiLOBijIJytMjDyI410L8TkAL39L8TnAL2zISiQwdimRqWS1ghFa2WJxiBtZBGkR4yzZrXmN3zWInjGofijZUGfRIsPZaWS9iuOQxGs9E16dDGbxuvybq28sKudYx2w8wula2WRwaiELTCMJTJuUKEUFqkvZHHSJclDc53CMsi1OqinI60bNLi543yKMcTTAcukMVT1IhuqMYjPQsxXIPnD02=R13b28056153da511d4134b1f82c2bcd0679524dbf9a1d1c3802e9405fe49caa270a248235f2a9d13c77dee452bd2e7f4e6928f222a9f5e659be68400f463fed960ab75142668d5be303ba1fee27349967dd7eb64890f549dd7f8a224d2f2cdcd1146da869d39ad02121707ab3cefaed98e20eb4197c2a36cf64211ea77ee2442537e0d910ae843691a0107ae7a4dc922d1e091f655675d6cabaad0096b863eec55bfb7a758b8f140b2c31595978ce000d75696b3616b76a3a6ee8daab6002029e9b9d8954a0dbcd2a5f332d84cfa370799a58a8f3e0e2cd4ba3ba5f1f76b88c97ee6d05033f40180d808eb158a5ed30695c50edc33a67895ec2755775882a0996fb59afdef8951daef8f7b9501bb9771ef326248f1ff58df2a8ecb9051d1827904d4061cd5b4de6eb0a6ff9277af1206eb8223fce66e58635927791fa96f09aee64b11ec0c88da6d303389edef162b4e13dc3ed286b2f2c28cdc315677c50e547d071245d7393a5085b9869d52858566021396e3aeb2b6de3c47631c40b3cc667845064aa70ef3a14884a802c9136d27a7f2f4c91a28edf6f6c3a7d5b611d98ea5db9036cb9d69f642ebee1c7d186d99263e81cd45c7ca2b02d74256aeb6ac7cac4483e0b39088d7be8e7531906bc4ee6919e5ae345897d6afe293c54a2bc45913158ed366df603c71deb73601bcd17626a78d08aa47f0e91f82364cc91ea424'
 
 WIN_EXPERIMENT_FLOW_DIALOG_EVENT_KEY = 'WIN_EXPERIMENT_FLOW_DIALOG'
 WIN_COMMUNICATION_MAP_DIALOG_EVENT_KEY = 'WIN_COMMUNICATION_MAP_DIALOG'

diff --git a/src_py/nerlPlanner/WinWorkerDialog.py b/src_py/nerlPlanner/WinWorkerDialog.py
@@ -137,7 +137,7 @@ def ui_update_all_values(WorkerWindow):
         clear_butt_key = KEY_LAYER_TYPE_SELECTION_CLEAR
         LayerTypesList = combo_list_editable_handler(WorkerWindow, event, values, LayerTypeMap, LayerTypesList,
                                                     selection_key, codes_key, add_butt_key, clear_butt_key)
-        WorkerWindow[KEY_NUM_OF_LAYERS_TYPES].update(f'({str(count_str_list_elements(LayerTypesList))})')
+        WorkerWindow[KEY_NUM_OF_LAYERS_TYPES].update(f'({str(count_str_list_elements(LayerTypesList))})') if LayerTypesList else None
 
         if event == KEY_LAYER_TYPE_HELP:
             sg.popup_ok(f"Layer type codes:\n{pretty_print_dict(LayerTypeMap)}", keep_on_top=True, title="Layer Type Codes")
@@ -149,15 +149,15 @@ def ui_update_all_values(WorkerWindow):
         clear_butt_key = KEY_LAYER_FUNCTIONS_SELECTION_CLEAR
         LayersFunctionsList = combo_list_editable_handler(WorkerWindow, event, values, ActivationFunctionsMap, LayersFunctionsList,
                                                             selection_key, codes_key, add_butt_key, clear_butt_key)
-        WorkerWindow[KEY_LAYERS_FUNCTIONS_CODES].update(f'({str(count_str_list_elements(LayersFunctionsList))})')
+        WorkerWindow[KEY_LAYERS_FUNCTIONS_CODES].update(f'({str(count_str_list_elements(LayersFunctionsList))})') if LayersFunctionsList else None
 
         # Activation codes combo and output list handling:
         if event == KEY_LAYER_METHODS_BUTTON_SELECT:
             LayerMethodSelection()
             LayersFunctionsList += ',' if not LayersFunctionsList.endswith(',') and LayersFunctionsList else ''
             LayersFunctionsList += global_layer_method_selection_code if global_layer_method_selection_code else ''
             WorkerWindow[KEY_LAYER_FUNCTIONS_CODES_INPUT].update(LayersFunctionsList)
-            WorkerWindow[KEY_LAYERS_FUNCTIONS_CODES].update(f'({str(count_str_list_elements(LayersFunctionsList))})')
+            WorkerWindow[KEY_LAYERS_FUNCTIONS_CODES].update(f'({str(count_str_list_elements(LayersFunctionsList))})') if LayersFunctionsList else None
 
         if event == KEY_ACTIVATION_LAYER_HELP:
             ActivationDictStr = f'Activation:\n{pretty_print_dict(ActivationFunctionsMap)}'

diff --git a/src_py/nerlPlanner/main.py b/src_py/nerlPlanner/main.py
@@ -1,6 +1,10 @@
+
+from Definitions import *
+PySimpleGUI_License = PYSIMPLEGUI_5_LICENSE
+
 import PySimpleGUI as sg
 from Handlers import *
-from Definitions import *
+
 from WinWorkerDialog import WinWorkerDialog
 from WinExperimentFlowDialog import WinExperimentFlowDialog
 from WinCommunicationMapDialog import WinCommunicationMapDialog

diff --git a/src_py/nerlPlanner/requirements.txt b/src_py/nerlPlanner/requirements.txt
@@ -1,4 +1,4 @@
 graphviz==0.20.1
 pydotplus==2.0.2
-PySimpleGUI==4.60.5
+PySimpleGUI==5.0.0
 pydot==1.4.2