Merge branch 'develop' into migration_to_pint
# Conflicts: # maphis/common/label_image.py # maphis/common/scale_setting_widget.py # maphis/plugins/maphis/general/common.py # maphis/plugins/maphis/properties/area.py # maphis/plugins/maphis/properties/circularity.py # maphis/plugins/maphis/properties/geodesic_length.py # maphis/plugins/maphis/properties/geodesic_length_cpp.py # maphis/plugins/maphis/properties/glcm.py # maphis/plugins/maphis/properties/max_feret.py # maphis/plugins/maphis/properties/mean_width.py # maphis/plugins/maphis/properties/mean_width_cpp.py # maphis/plugins/maphis/properties/oriented_bbox_dimensions.py # maphis/plugins/profile_register/general/profile_registering.py
Loading
Please sign in to comment