Skip to content
Snippets Groups Projects
Commit b6fac392 authored by polarbean's avatar polarbean
Browse files

remove redundant code from deformation calculation

parent 446b1dfd
No related branches found
No related tags found
No related merge requests found
"""This code was written by Gergely Csucs and Rembrandt Bakker""" """This code was written by Gergely Csucs, Harry Carey and Rembrandt Bakker"""
import numpy as np import numpy as np
...@@ -14,8 +14,8 @@ def triangulate(w, h, markers): ...@@ -14,8 +14,8 @@ def triangulate(w, h, markers):
edges = [0] * ((len(markers) + 4) * (len(markers) + 4 - 1) // 2) edges = [0] * ((len(markers) + 4) * (len(markers) + 4 - 1) // 2)
triangles = [Triangle(0, 1, 2, vertices, edges), Triangle(1, 2, 3, vertices, edges)] triangles = [Triangle(0, 1, 2, vertices, edges), Triangle(1, 2, 3, vertices, edges)]
edges[0] = edges[1] = edges[4] = edges[5] = 2 edges[0] = edges[1] = edges[4] = edges[5] = 2
markers = list(set(tuple(m) for m in markers)) # markers = list(set(tuple(m) for m in markers))
markers = [list(m) for m in markers] # markers = [list(m) for m in markers]
for marker in markers: for marker in markers:
x, y = marker[2:4] x, y = marker[2:4]
......
...@@ -15,12 +15,12 @@ from PyNutil import PyNutil ...@@ -15,12 +15,12 @@ from PyNutil import PyNutil
### get_coordinates, if use_flat=True, place flat files in folder titled "flat_files" at same level as "segmentations" folder ### get_coordinates, if use_flat=True, place flat files in folder titled "flat_files" at same level as "segmentations" folder
pnt = PyNutil( pnt = PyNutil(
segmentation_folder="../tests/test_data/linear_allen_mouse/", segmentation_folder="../tests/test_data/nonlinear_allen_mouse/",
alignment_json="../tests/test_data/linear_allen_mouse/alignment_linear.json", alignment_json="../tests/test_data/nonlinear_allen_mouse/alignment.json",
colour=[0, 0, 0], colour=[0, 0, 0],
atlas_path="../tests/test_data/allen_mouse_2017_atlas/annotation_25_reoriented_2017.nrrd", atlas_path="../tests/test_data/allen_mouse_2017_atlas/annotation_25_reoriented_2017.nrrd",
label_path="../tests/test_data/allen_mouse_2017_atlas//allen2017_colours.csv", label_path="../tests/test_data/allen_mouse_2017_atlas//allen2017_colours.csv",
) )
pnt.get_coordinates(object_cutoff=0, use_flat=True) pnt.get_coordinates(object_cutoff=0, use_flat=False)
pnt.quantify_coordinates() pnt.quantify_coordinates()
pnt.save_analysis("../test_result/test_linear_allen_mouse") pnt.save_analysis("../test_result/test_nonlinear_allen_mouse")
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment