Skip to content

Commit

Permalink
Rename CellSeg into CellMet
Browse files Browse the repository at this point in the history
  • Loading branch information
sophietheis committed Oct 11, 2024
1 parent c75206e commit 0c83190
Show file tree
Hide file tree
Showing 27 changed files with 2,753,946 additions and 6,274 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/CellSegAnalysis
url: https://pypi.org/p/CellMet
permissions:
id-token: write
steps:
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build/

notebooks/.ipynb_checkpoints/

CellSeg.egg-info/
CellMet.egg-info/

notebooks/*/*.png

Expand All @@ -17,6 +17,7 @@ notebooks/*/*.png

*.eps

CellSeg/__pycache__/
CellMet/__pycache__/

dist/

File renamed without changes.
10 changes: 10 additions & 0 deletions CellMet/_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# THIS FILE IS GENERATED FROM CellMet SETUP.PY
#
short_version = '0.9.1'
version = '0.9.1'
full_version = '0.9.1.dev0+c75206e'
git_revision = 'c75206eb2718cd9793b3e57de99a5513ef3d65d5'
release = False
if not release:
version = full_version
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 0 additions & 10 deletions CellSeg/version.py

This file was deleted.

14 changes: 7 additions & 7 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## System requirements
Linux, Windows and Mac OS are supported for running the code. At least 8 GB of RAM is required to run the software. 32GB may be required for larger images. The software has been heavily tested on Ubuntu 22.04 and less-tested on Mac OS and Windows 10. Please open an issue if you have any problems with installation.

## Install CellSeg using pip
## Install CellMet using pip

This install a cross-platform, pure python version of CellSeg.
This install a cross-platform, pure python version of CellMet.
Some advanced features are not available, namely:

```sh
Expand All @@ -17,21 +17,21 @@ debian-like linux distribution. If you already have a basic
scientific python stack, use it, don't install anaconda.


### Download and install `CellSeg` from source
### Download and install `CellMet` from source

If you want to do that, I assume you already know how to manage
dependencies on your platform. The simplest way to manage dependencies is to use [`conda`](https://docs.conda.io/en/latest/miniconda.html) to manage the dependencies (you can use [`mamba`](https://github.com/mamba-org/mamba) as a faster alternative to conda).


```bash
git clone --recursive https://github.com/TimSaundersLab/CellSeg.git
cd CellSeg
git clone --recursive https://github.com/TimSaundersLab/CellMet.git
cd CellMet
```

Then create a virtual environment:

```bash
conda create --name cellseg
conda create --name cellmet
```

Then install python:
Expand All @@ -41,5 +41,5 @@ pip install .



If all went well, you have successfully installed CellSeg.
If all went well, you have successfully installed CellMet.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CellSeg
# CellMet
A generalist algorithm to analyse cell shape from 3D labeled image.

<p align="center">
Expand All @@ -11,12 +11,12 @@ This code is made to analyse cell shape from 3D labeled image. It is divide in t
- We determine edges and faces associated to each cell. Quality of this analysis is dependant of the quality of the labeled image. There is no segmentation correction.
- Analysis of cells, faces and edges.

There is a Python API to allow user to integrate CellSeg into your custom workflow.
There is a Python API to allow user to integrate CellMet into your custom workflow.

## Input/Output and datas organisation
### Input
In order to be able to use this project. You first need to segment you image using CellPose (or any other software that gives 3D label image). You need to be satisfied by your label image, since there is no manual correction (only filter can be apply to remove cells that has a volume below a threshold for example).
Then, you can perform 3D cell segmentation with CellSeg.
Then, you can perform 3D cell segmentation with CellMet.

### Output and datas organisation
You can generate ply/obj file for each cells.
Expand All @@ -27,7 +27,7 @@ Datas are organised as half-edge structures. The vertex, edge, face and cell tab
</td>
<td >
<p align="center">
<img width="300" alt="image" src="https://github.com/TimSaundersLab/CellSeg/assets/17041165/ee0a6baf-7f74-4ab4-b774-4e394f9d3d36">
<img width="300" alt="image" src="https://github.com/TimSaundersLab/CellMet/assets/17041165/ee0a6baf-7f74-4ab4-b774-4e394f9d3d36">
</p>
</td>
</tr>
Expand Down Expand Up @@ -149,7 +149,7 @@ Prerequisite are necessary to perform the analysis. It performs 3D distance mapp
There are two ways of launching the GUI :
- run [GUI.ipynb](https://github.com/sophietheis/Zebrafish-Muscle/blob/main/notebooks/GUI.ipynb) notebook
- run in command line `python CellSeg/export_gui.py`
- run in command line `python CellMet/export_gui.py`
-->


Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CellSeg
name: CellMet
channels:
- conda-forge

Expand Down
6,229 changes: 12 additions & 6,217 deletions notebooks/0-Paper-2DCellSegmentation.ipynb

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions notebooks/0-Paper-3DCellSegmentation-TimeExecution.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"\n",
"import matplotlib.pyplot as plt\n",
"\n",
"from CellSeg.segmentation import Segmentation\n",
"from CellSeg.analysis import cell_analysis, edge_analysis, face_analysis\n",
"from CellMet.segmentation import Segmentation\n",
"from CellMet.analysis import cell_analysis, edge_analysis, face_analysis\n",
"%load_ext snakeviz"
]
},
Expand All @@ -38,7 +38,7 @@
"metadata": {},
"outputs": [],
"source": [
"path = \"/home/u2175049/Documents/Code/CellSeg/notebooks/\"\n",
"path = \"/home/u2175049/Documents/Code/CellMet/notebooks/\"\n",
"seg_filename = \"artificial_tissue_70cells_1000px_0.tif\"\n",
"pixel_size = dict(x_size = 0.21,\n",
" y_size = 0.21,\n",
Expand Down
8 changes: 4 additions & 4 deletions notebooks/0-Paper-DrosophilaEmbryoAnalysis.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"\n",
"import matplotlib.pyplot as plt\n",
"\n",
"from CellSeg.segmentation import Segmentation\n",
"from CellSeg.analysis import cell_analysis, edge_analysis, face_analysis\n",
"from CellMet.segmentation import Segmentation\n",
"from CellMet.analysis import cell_analysis, edge_analysis, face_analysis\n",
"\n",
"from CellSeg.plot import random_color\n",
"from CellMet.plot import random_color\n",
"\n",
"import ZebrafishMuscle.plot as ZMplot\n",
"\n",
Expand All @@ -42,7 +42,7 @@
"metadata": {},
"outputs": [],
"source": [
"# path = \"/home/u2175049/Documents/Code/CellSeg/notebooks/\"\n",
"# path = \"/home/u2175049/Documents/Code/CellMet/notebooks/\"\n",
"# seg_filename = \"artificial_tissue_150cells_5_to70cells.tif\"\n",
"# pixel_size = dict(x_size = 0.21,\n",
"# y_size = 0.21,\n",
Expand Down
Loading

0 comments on commit 0c83190

Please sign in to comment.