changeset 290:fe1a93189290 draft

Uploaded
author luca_milaz
date Sun, 04 Aug 2024 19:38:41 +0000
parents 77025f4b9e6d
children 7f0c1363f1dc
files marea_2/flux_to_map.py
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/marea_2/flux_to_map.py	Sun Aug 04 19:23:37 2024 +0000
+++ b/marea_2/flux_to_map.py	Sun Aug 04 19:38:41 2024 +0000
@@ -878,8 +878,8 @@
     
     # Add text for min and max values
     font = ImageFont.load_default()
-    draw.text((10, height - 20), f'{min_value:.2f}', fill='black', font=font)
-    draw.text((width - 50, height - 20), f'{max_value:.2f}', fill='black', font=font)
+    draw.text((10, height - 20), f'{min_value:.2f}', fill='white', font=font)
+    draw.text((width - 50, height - 20), f'{max_value:.2f}', fill='white', font=font)
     
     # Save the image
     image.save(path.show())
@@ -1005,7 +1005,15 @@
 
     ids, class_pat = getClassesAndIdsFromDatasets(ARGS.input_datas_fluxes, ARGS.input_data_fluxes, ARGS.input_class_fluxes, ARGS.names_fluxes)
 
-    computeEnrichmentMeanMedian(core_map, class_pat, ids)
+    if(ARGS.choice_map == utils.Model.HMRcore):
+        temp_map = utils.Model.HMRcore_no_legend
+        computeEnrichmentMeanMedian(temp_map.getMap(ARGS.tool_dir), class_pat, ids)
+    elif(ARGS.choice_map == utils.Model.ENGRO2):
+        temp_map = utils.Model.ENGRO2_no_legend
+        computeEnrichmentMeanMedian(temp_map.getMap(ARGS.tool_dir), class_pat, ids)
+    else:
+        computeEnrichmentMeanMedian(core_map, class_pat, ids)
+    
 
     computeEnrichment(core_map, class_pat, ids)