# HG changeset patch # User luca_milaz # Date 1722800321 0 # Node ID fe1a9318929035ef802230d43f47ef2fca3843eb # Parent 77025f4b9e6dda91cf3a4309ff25130282d52ba2 Uploaded diff -r 77025f4b9e6d -r fe1a93189290 marea_2/flux_to_map.py --- 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)