pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated correct package versions

Browse source
This commit is contained in:
Luis Aleixo 2023-02-24 15:45:03 +01:00
parent a15f32d2a7
commit 25cea29532
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
caimira/apps/expert.py
View file

@ -253,8 +253,9 @@ class ExposureComparissonResult(View):
self.update_plot(exp_models, updated_labels)
def update_plot(self, exp_models: typing.Tuple[models.ExposureModel, ...], labels: typing.Tuple[str, ...]):
[line.remove() for line in self.ax.lines]
[line.remove() for line in self.ax2.lines]
self.ax.lines = []
self.ax2.lines = []
start, finish = models_start_end(exp_models)
colors=['blue', 'red', 'orange', 'yellow', 'pink', 'purple', 'green', 'brown', 'black' ]
ts = np.linspace(start, finish, num=250)
@ -1105,7 +1106,9 @@ class MultiModelView(View):
# last scenario, so this should be controlled in the remove_tab method.
buttons_w_delete = widgets.HBox(children=(duplicate_button, delete_button))
buttons = duplicate_button if len(self._tab_model_ids) < 2 else buttons_w_delete
return widgets.VBox(children=(buttons, rename_text_field))
# TODO put back the delete button.
# return widgets.VBox(children=(buttons, rename_text_field))
return widgets.VBox(children=(duplicate_button, rename_text_field))
def models_start_end(models: typing.Sequence[models.ExposureModel]) -> typing.Tuple[float, float]:

8
caimira/apps/simulator.py
View file

@ -161,7 +161,7 @@ class ExposureComparissonResult(View):
self.update_plot(CO2_models, updated_labels)
def update_plot(self, CO2_models: typing.Tuple[models.CO2ConcentrationModel, ...], labels: typing.Tuple[str, ...]):
[line.remove() for line in self.ax.lines]
self.ax.lines = []
start, finish = models_start_end(CO2_models)
colors=['blue', 'red', 'orange', 'yellow', 'pink', 'purple', 'green', 'brown', 'black' ]
@ -203,6 +203,7 @@ class CO2Application(Controller):
))
for i, title in enumerate(['Current scenario', 'Scenario comparison', "Debug"]):
self._results_tab.set_title(i, title)
self.widget = widgets.HBox(
children=(
self.multi_model_view.widget,
@ -227,7 +228,6 @@ class CO2Application(Controller):
self._active_scenario = len(self._model_scenarios) - 1
model.dcs_observe(self.notify_model_values_changed)
self.notify_scenarios_changed()
self.notify_model_values_changed()
def _find_model_id(self, model_id):
for index, (name, model) in enumerate(list(self._model_scenarios)):
@ -730,7 +730,9 @@ class MultiModelView(View):
# last scenario, so this should be controlled in the remove_tab method.
buttons_w_delete = widgets.HBox(children=(duplicate_button, delete_button))
buttons = duplicate_button if len(self._tab_model_ids) < 2 else buttons_w_delete
return widgets.VBox(children=(buttons, rename_text_field))
# TODO put back the delete button.
# return widgets.VBox(children=(buttons, rename_text_field))
return widgets.VBox(children=(duplicate_button, rename_text_field))
def models_start_end(models: typing.Sequence[models.CO2ConcentrationModel]) -> typing.Tuple[float, float]: