Commit 594b1eaf authored by cmaffeo2's avatar cmaffeo2
Browse files

Reordered input for set_splines

parent 1d4edc3a
......@@ -95,7 +95,7 @@ def set_splines(seg, coordinates, hid, hmap, hrank):
coords.append(np.mean( [coordinates[r,:] for r in ids ], axis=0 ))
contours.append( float(rank)/maxrank )
coords = np.array(coords)
seg.set_splines(coords,contours)
seg.set_splines(contours,coords)
def model_from_basepair_stack_3prime(coordinates, basepair, stack, three_prime, sequence=None):
......
......@@ -385,15 +385,14 @@ class Segment(ConnectableElement, Group):
def __repr__(self):
return "<{} {}[{:d}]>".format( type(self), self.name, self.num_nt )
def set_splines(self, coords, contours):
def set_splines(self, contours, coords):
tck, u = interpolate.splprep( coords.T, u=contours, s=0, k=1)
self.position_spline_params = tck
def _set_splines_from_ends(self):
self.quaternion_spline_params = None
self.set_splines(np.array([self.start_position,
self.end_position]), [0,1])
coords = np.array([self.start_position, self.end_position])
self.set_splines([0,1], coords)
def clear_all(self):
Group.clear_all(self) # TODO: use super?
......
Markdown is supported
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