Skip to content
This repository was archived by the owner on Feb 9, 2024. It is now read-only.

Commit c9a4025

Browse files
committed
Updated the version. Updated README.md and moved arc_sim.py. Added the updated ellipse simulation function in demo.py, but it will not be callable through the command line in this version.
1 parent 8a292da commit c9a4025

4 files changed

Lines changed: 153 additions & 260 deletions

File tree

README.md

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For those who want to run the program immediately, just follow these commands in
2020
`fibermorph --demo_real_section --output_directory /Users/<UserName>/<ExistingPath>/<NewFolderName`
2121
5. Use fibermorph on your own grayscale TIFFs of longitudinal or cross-sectional hair images.
2222

23-
`fibermorph --curvature --input_directory /Users/<UserName>/<ImageFolderPath> --output_directory /Users/<UserName>/<ExistingPath>/ --window_size 0.5 --window_unit mm --resolution 132 --save_image --within_element --jobs 2`
23+
`fibermorph --curvature --input_directory /Users/<UserName>/<ImageFolderPath> --output_directory /Users/<UserName>/<ExistingPath>/ --resolution_mm 132 --jobs 2`
2424

2525
and
2626

@@ -29,36 +29,27 @@ For those who want to run the program immediately, just follow these commands in
2929

3030
## Setting up
3131
1. We recommend you download [miniconda](https://docs.conda.io/en/latest/miniconda.html) for your operating system.
32+
You may also download [Anaconda](https://docs.anaconda.com/anaconda/install/). The only difference is that Anaconda comes preloaded with more libraries (500 Mb). You won't need this to run fibermorph, so we recommend you stick to minconda which is the smaller (58 Mb) and quicker to download.
3233

33-
You may also download [Anaconda](https://docs.anaconda.com/anaconda/install/). The only difference is that Anaconda comes preloaded with more libraries (500 Mb). You won't need this to run fibermorph, so we recommend you stick to minconda which is the smaller (58 Mb) and quicker to download.
34-
35-
Whichever you choose *be sure to download the version with Python 3.X and not Python 2.X*.
36-
34+
Whichever you choose *be sure to download the version with Python 3.X and not Python 2.X*.
3735
2. Open a terminal.
38-
39-
#### Mac OS:
40-
- Open the *Terminal* application.
41-
#### Windows:
42-
- Type `miniconda` in the search box and open the application.
43-
#### Linux:
44-
- Open the *Terminal* application.
45-
36+
#### Mac OS:
37+
- Open the *Terminal* application.
38+
#### Windows:
39+
- Type `miniconda` in the search box and open the application.
40+
#### Linux:
41+
- Open the *Terminal* application.
4642
3. Now you can set up a virtual environment.
4743

48-
Create an empty conda environment, e.g. `conda create -n <fibermorph_env python=3.8` and load it `conda activate fibermorph_env`
49-
50-
You are now ready to install fibermorph!
51-
44+
Create an empty conda environment, e.g. `conda create -n <fibermorph_env python=3.8` and load it `conda activate fibermorph_env`
45+
You are now ready to install fibermorph!
5246

5347
## Install the package
5448

5549
1. After having activated your new virtual environment, you can simply run `pip install fibermorph`.
56-
57-
You can find the latest release [here](https://github.com/tinalasisi/fibermorph/) on this GitHub page and on the [fibermorph PyPI page](https://pypi.org/project/fibermorph/).
58-
50+
You can find the latest release [here](https://github.com/tinalasisi/fibermorph/) on this GitHub page and on the [fibermorph PyPI page](https://pypi.org/project/fibermorph/).
5951
2. You have successfully installed fibermorph.
60-
61-
The package is now ready for use. Enter `fibermorph -h` or `fibermorph --help` to see all the flags. You can keep reading to try out the demos and read instructions on the various modules within the package.
52+
The package is now ready for use. Enter `fibermorph -h` or `fibermorph --help` to see all the flags. You can keep reading to try out the demos and read instructions on the various modules within the package.
6253

6354
## Demo data
6455
Before using this on any of your own data, it's recommended that you test that you test whether fibermorph is working properly on your machine. There are a few `demo` modules you can use to check whether fibermorph is running correctly.
@@ -89,19 +80,19 @@ To run the demo, you will input something like:
8980
### Curvature
9081
To calculate curvature from grayscale TIFF images of hair fibers, the flag `--curvature` is used with the following flags in addition to input and output directories:
9182
```
92-
--resolution_mm Integer. Number of pixels per mm for curvature analysis.
93-
--window_size [ ...]
94-
Float or integer. Desired size for window of measurement for curvature
95-
analysis in pixels or mm (given the flag --window_unit). Default is 10.
96-
Works when the --window_unit is pixels.
97-
--window_unit {px,mm}
98-
String. Unit of measurement for window of measurement for curvature
99-
analysis. Can be 'px' (pixels) or 'mm'. Default is 'px'.
100-
-s, --save_image Default is False. Will save intermediate curvature processing images if
101-
--save_image flag is included.
102-
-W, --within_element Boolean. Default is False. Will create an additional directory with
103-
spreadsheets of raw curvature measurements for each hair if the
104-
--within_element flag is included.
83+
--resolution_mm Integer. Number of pixels per mm for curvature analysis.
84+
Default is 132.
85+
--window_size [ ...] Float or integer or None. Desired size for window of measurement
86+
for curvature analysis in pixels or mm (given
87+
the flag --window_unit). If nothing is entered, the default
88+
is None and the entire hair will be used to for the curve fitting."
89+
--window_unit {px,mm} String. Unit of measurement for window of measurement for curvature
90+
analysis. Can be 'px' (pixels) or 'mm'. Default is 'px'.
91+
-s, --save_image Default is False. Will save intermediate curvature processing images if
92+
--save_image flag is included.
93+
-W, --within_element Boolean. Default is False. Will create an additional directory with
94+
spreadsheets of raw curvature measurements for each hair if the
95+
--within_element flag is included.
10596
10697
```
10798

@@ -113,7 +104,7 @@ fibermorph --curvature --input_directory /Users/<UserName>/<ImageFolderPath> --o
113104
### Section
114105
To calculate cross-sectional properties from grayscale TIFF images of hair fibers, the flag `--section` is used with the following flags:
115106
```
116-
--resolution_mu Float. Number of pixels per micron for section analysis.
107+
--resolution_mu Float. Number of pixels per micron for section analysis. Default is 4.25.
117108
--minsize Integer. Minimum diameter in microns for sections. Default is 20.
118109
--maxsize Integer. Maximum diameter in microns for sections. Default is 150.
119110

arc_sim.py

Lines changed: 0 additions & 121 deletions
This file was deleted.

fibermorph/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.9"
1+
__version__ = "0.2.0"

0 commit comments

Comments
 (0)