.

2021-03-01 08:35:03 +00:00
parent 39506ca738
commit 6d8d724b7b
1 changed files with 7 additions and 5 deletions
@@ -372,17 +372,19 @@ class LongSeries(models.Model):
        for i, f in files:
            if hasattr(f, field):
                slices.append(f)
-                map[f.SliceLocation] = i
+                #map[f.SliceLocation] = i
+                map[f[field].value] = i
            else:
                skipcount = skipcount + 1

        print("skipped, no SliceLocation: {}".format(skipcount))

        # ensure they are in the correct order
-        if field == "SliceLocation":
-            slices = sorted(slices, key=lambda s: s.SliceLocation)
-        elif field == "InstanceNumber":
-            slices = sorted(slices, key=lambda s: s.InstanceNumber)
+        slices = sorted(slices, key=lambda s: s[field].value)
+        #if field == "SliceLocation":
+        #    slices = sorted(slices, key=lambda s: s.SliceLocation)
+        #elif field == "InstanceNumber":
+        #    slices = sorted(slices, key=lambda s: s.InstanceNumber)


        #print(slices)