Skip to content

Commit df473bd

Browse files
committed
Merge branch 'devel' into pr/140
2 parents dea08b4 + 0cb3786 commit df473bd

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.vscode/settings.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"Dscijava",
2020
"flatfield",
2121
"Fluo",
22+
"Haase",
2223
"IJPB",
2324
"imageplus",
2425
"imarisconvert",
@@ -46,6 +47,7 @@
4647
"PYENV",
4748
"pylint",
4849
"ransac",
50+
"relnotes",
4951
"renyi",
5052
"repartitions",
5153
"resultstable",
@@ -55,6 +57,7 @@
5557
"rollingball",
5658
"scijava",
5759
"shanbhag",
60+
"SJLOG",
5861
"sjlogging",
5962
"smtpserver",
6063
"spimdata",
@@ -63,10 +66,14 @@
6366
"strtools",
6467
"subfolders",
6568
"subsampling",
69+
"sumpix",
6670
"TESTDATA",
6771
"thresholding",
6872
"trackmate",
6973
"virtualenv",
70-
"virtualfish"
74+
"virtualfish",
75+
"voxelsizex",
76+
"voxelsizey",
77+
"voxelsizez"
7178
],
7279
}

src/imcflibs/imagej/misc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def get_free_memory():
350350
def setup_clean_ij_environment(rm=None, rt=None): # pylint: disable-msg=unused-argument
351351
"""Set up a clean and defined ImageJ environment.
352352
353-
This funtion clears the active results table, the ROI manager, and the log.
353+
This function clears the active results table, the ROI manager, and the log.
354354
Additionally, it closes all open images and resets the ImageJ options,
355355
performing a [*Fresh Start*][fresh_start].
356356
@@ -496,7 +496,7 @@ def write_ordereddict_to_csv(out_file, content):
496496
497497
Notes
498498
-----
499-
- The CSV file will use the semicolon charachter (`;`) as delimiter.
499+
- The CSV file will use the semicolon character (`;`) as delimiter.
500500
- When appending to an existing file, the column structure has to match. No
501501
sanity checking is being done on this by the function!
502502
- The output file is opened in binary mode for compatibility.

0 commit comments

Comments
 (0)