|
10 | 10 |
|
11 | 11 | from ij import IJ # pylint: disable-msg=import-error |
12 | 12 | from ij.plugin import Duplicator, ImageCalculator, StackWriter |
| 13 | +from org.scijava.widget import TextWidget, WidgetStyle |
13 | 14 |
|
14 | 15 | from .. import pathtools |
15 | 16 | from ..log import LOG as log |
16 | 17 | from . import bioformats as bf |
17 | 18 | from . import prefs |
18 | 19 |
|
19 | | -from org.scijava.widget import WidgetStyle |
20 | | -from org.scijava.widget import TextWidget |
21 | | - |
22 | 20 |
|
23 | 21 | def show_status(msg): |
24 | 22 | """Update the ImageJ status bar and issue a log message. |
@@ -533,7 +531,9 @@ def write_ordereddict_to_csv(out_file, content): |
533 | 531 | dict_writer.writerows(content) |
534 | 532 |
|
535 | 533 |
|
536 | | -def save_image_in_format(imp, format, out_dir, series, pad_number, split_channels, suffix=""): |
| 534 | +def save_image_in_format( |
| 535 | + imp, format, out_dir, series, pad_number, split_channels, suffix="" |
| 536 | +): |
537 | 537 | """Save an ImagePlus object in the specified format. |
538 | 538 |
|
539 | 539 | This function provides flexible options for saving ImageJ images in various |
@@ -738,22 +738,31 @@ def run_imarisconvert(file_path, pixel_calibration=None, output_folder=""): |
738 | 738 | timed_log("Error converting [%s]: %d" % (file_path, result)) |
739 | 739 |
|
740 | 740 |
|
741 | | -def convert_bytes(size): |
742 | | - """Convert size from bytes to a readable value. |
| 741 | +def bytes_to_human_readable(size): |
| 742 | + """Convert a byte count to a human-readable string using binary units. |
743 | 743 |
|
744 | 744 | Parameters |
745 | 745 | ---------- |
746 | 746 | size : int |
747 | | - Byte size |
| 747 | + Byte size (number of bytes). |
748 | 748 |
|
749 | 749 | Returns |
750 | 750 | ------- |
751 | 751 | str |
752 | | - Easy to read value with the correct unit |
| 752 | + Human-friendly size string, e.g. `"512.0 bytes"`, `"2.0 KB"`, |
| 753 | + `"1.0 MB"`. |
| 754 | +
|
| 755 | + Notes |
| 756 | + ----- |
| 757 | + - Uses powers of 1024 (KB = 1024 bytes). |
| 758 | + - Always returns a string with one decimal place and the unit. |
753 | 759 | """ |
754 | | - for x in ["bytes", "KB", "MB", "GB", "TB"]: |
| 760 | + |
| 761 | + for unit in ["bytes", "KB", "MB", "GB", "TB"]: |
755 | 762 | if size < 1024.0: |
756 | | - return "%3.1f %s" % (size, x) |
| 763 | + return "%3.1f %s" % (size, unit) |
757 | 764 | size /= 1024.0 |
758 | 765 |
|
759 | | - return size |
| 766 | + # If the value is larger than the largest unit, fall back to TB with |
| 767 | + # the current value (already divided accordingly). |
| 768 | + return "%3.1f %s" % (size, "TB") |
0 commit comments