Skip to content

Commit

Permalink
Version Update of Nerlplanner + fix of worker dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
leondavi committed Jul 6, 2024
1 parent b34c2b5 commit ad0f2a6
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src_cpp/common/worker_definitions_ag.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

// This file was auto generated
// Generated by Nerlplanner version: 1.0.2
// Generated by Nerlplanner version: 1.0.3

namespace nerlnet {

Expand Down
2 changes: 1 addition & 1 deletion src_erl/NerlnetApp/src/Bridge/layers_types_ag.hrl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% This is an auto generated .hrl file
% DC Fields Generated by Nerlplanner version: 1.0.2
% DC Fields Generated by Nerlplanner version: 1.0.3

-define(LAYERS_TYPE_DEFAULT_IDX,"0").
-define(LAYERS_TYPE_SCALING_IDX,"1").
Expand Down
2 changes: 1 addition & 1 deletion src_erl/NerlnetApp/src/Bridge/models_types_ag.hrl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% This is an auto generated .hrl file
% DC Fields Generated by Nerlplanner version: 1.0.2
% DC Fields Generated by Nerlplanner version: 1.0.3

-define(MODEL_TYPE_NN_IDX,"0").
-define(MODEL_TYPE_APPROXIMATION_IDX,"1").
Expand Down
2 changes: 1 addition & 1 deletion src_erl/NerlnetApp/src/dc_definitions_ag.hrl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% This is an auto generated .hrl file
% DC Fields Generated by Nerlplanner version: 1.0.2
% DC Fields Generated by Nerlplanner version: 1.0.3

-define(DC_KEY_NERLNET_SETTINGS_ATOM,nerlnetSettings).
-define(DC_KEY_FREQUENCY_ATOM,frequency).
Expand Down
2 changes: 1 addition & 1 deletion src_erl/NerlnetApp/src/router_definitions_ag.hrl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% This is an auto generated .hrl file
% Source Fields Generated by Nerlplanner version: 1.0.2
% Source Fields Generated by Nerlplanner version: 1.0.3

-define(ROUTER_POLICY_ROUTINGTABLE_IDX,"0").

Expand Down
2 changes: 1 addition & 1 deletion src_erl/NerlnetApp/src/source_definitions_ag.hrl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% This is an auto generated .hrl file
% Source Fields Generated by Nerlplanner version: 1.0.2
% Source Fields Generated by Nerlplanner version: 1.0.3

-define(SOURCE_POLICY_CASTING_IDX,"0").
-define(SOURCE_POLICY_ROUNDROBIN_IDX,"1").
Expand Down
2 changes: 1 addition & 1 deletion src_erl/NerlnetApp/src/worker_definitions_ag.hrl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% This is an auto generated .hrl file
% Worker Fields Generated by Nerlplanner version: 1.0.2
% Worker Fields Generated by Nerlplanner version: 1.0.3

-define(WORKER_FIELD_KEY_MODEL_TYPE,modelType).
-define(WORKER_FIELD_KEY_MODEL_ARGS,modelArgs).
Expand Down
7 changes: 5 additions & 2 deletions src_py/nerlPlanner/WinWorkerDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ 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))})') if LayerTypesList else None
if event: # Protects from update when windows is closed
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")
Expand All @@ -149,7 +150,9 @@ 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))})') if LayersFunctionsList else None

if event: # Protects from update when windows is closed
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:
Expand Down

0 comments on commit ad0f2a6

Please sign in to comment.