started rewrite of saving images

.gitignore

@@ -0,0 +1,7 @@
+*.dat
+*.svg
+*.files
+*bugs.txt
+Options.txt
+*.pyc
+Data

Stuff/Modules/cm.py

@@ -1045,7 +1045,11 @@ def recognizeStrategy(self, i0, i1, minSpeed, percentSize):
         x0, y0 = self.data[i0][self.indices]
         x1, y1 = self.data[i1][self.indices]
         t0, t1 = self.data[i0][1], self.data[i1][1]
-        speed = (sqrt(((x1 - x0)**2 + (y1 - y0)**2)) / self.trackerResolution) / ((t1 - t0) / 1000)
+        try:
+            speed = (sqrt(((x1 - x0)**2 + (y1 - y0)**2)) / self.trackerResolution) / ((t1 - t0) / 1000)
+        except Exception:
+            print(self.data[i0])
+            print(self.data[i1])
         if speed > minSpeed:
             border = self.radius * (1 - (percentSize / 100))
             cx, cy = self.centerX, self.centerY
@@ -1087,8 +1091,10 @@ def getStrategies(self, time = 20, startTime = 0, rows = 25, minSpeed = 10, minA
         shocks = deque(self.getShocks(time = time, startTime = startTime, indices = True))
 
         nextShock = shocks.popleft() if shocks else i1 + 2*rows + 2
-        if nextShock < i0 + rows:
+        if i0 < nextShock < i0 + rows:
             lastStrategy = self.recognizeStrategy(i0, nextShock, minSpeed, borderPercentSize)
+        elif i0 == nextShock:
+            lastStrategy = self.recognizeAfterShockStrategy(i0, i0 + rows, minAngle)
         else:
             lastStrategy = self.recognizeStrategy(i0, i0 + rows, minSpeed, borderPercentSize)
         beginning = i0 if indices else t0
@@ -1192,7 +1198,7 @@ def main():
     start = 9
     end = 12
     diff = end - start
-    
+
     class DummyNumber:
         def __init__(self, N):
             self.number = str(N)
@@ -1211,7 +1217,7 @@ def __init__(self):
     import image
     import graphs
 
-    cm = CM("12rNO453_Arena.dat")
+    cm = CM("13a_12_Arena.dat")
     svg = image.SVG(600, 120, scale = 2)
     graph = graphs.AngleGraph(parent = Parent(), cm = cm, purpose = "")
     _, __, furtherText = graph.saveGraph(cm)

Stuff/Modules/explorer.py

@@ -30,7 +30,7 @@
 from showtracks import ShowTracks
 from filestorage import FileStorageFrame
 from commonframes import TimeFrame, returnName
-from image import SVG
+from image import svgSave
 from processor import ProgressWindow
 from optionget import optionGet
 from graphs import getGraphTypes, Graphs, SvgGraph, SpeedGraph, DistanceFromCenterGraph
@@ -302,19 +302,19 @@ def saveImages(self):
             self.status.set("No file selected.")
             self.bell()
             return
-
+       
         problems = 0
         for filename in files:
-            try:
-                if filename in self.fileStorage.pairedfiles:
-                    cm = m.CL(filename, self.fileStorage.pairedfiles[filename])
-                else:
-                    cm = m.CL(filename, "auto")
-                if self.removeReflectionsVar.get():
-                    cm.removeReflections(points = self.fileStorage.reflections.get(filename, None))
-                self.saveOneImage(cm, filename)               
-            except Exception:
-                problems += 0
+            #try:
+            if filename in self.fileStorage.pairedfiles:
+                cm = m.CL(filename, self.fileStorage.pairedfiles[filename])
+            else:
+                cm = m.CL(filename, "auto")
+            if self.removeReflectionsVar.get():
+                cm.removeReflections(points = self.fileStorage.reflections.get(filename, None))
+            svgSave(cm, filename, self.saveWhatVar.get(), self)
+            #except Exception:
+            #    problems += 1
 
             if len(files) > 1:
                 progress.addOne()
@@ -338,63 +338,6 @@ def saveImages(self):
             self.root.config(cursor = "")
 
 
-    def saveOneImage(self, cm, filename):
-        "saves image for one file"
-        directory = optionGet("ImageDirectory", os.getcwd(), "str", True)
-        # pridat moznost scale u vsech SVG
-        
-        what =  self.saveWhatVar.get()    
-
-        if what == "both frames":
-            self.svg = SVG(600, 300)
-            self.saveArenaFrame(cm)
-            self.saveRoomFrame(cm, origin = (300, 0))
-        elif what == "arena frame":
-            self.svg = SVG(300, 300) 
-            self.saveArenaFrame(cm)
-        elif what == "room frame":
-            self.svg = SVG(300, 300)
-            self.saveRoomFrame(cm)
-        elif what == "graph":
-            self.svg = SVG(600, 120)
-            self.saveGraph(cm)
-        elif what == "all":
-            self.svg = SVG(600, 420)
-            self.saveArenaFrame(cm)
-            self.saveRoomFrame(cm, origin = (300, 0))
-            self.saveGraph(cm, origin = (0, 300))
-            
-        self.svg.save(os.path.join(directory, os.path.splitext(os.path.basename(filename))[0] +
-                                   "_" + what.replace(" ", "_") + ".svg")) # upravit
-            
-
-    def saveArenaFrame(self, cm, origin = (0, 0)):
-        "saves info about arena frame in self.svg"
-        self.svg.drawAAPA(cm, frame = "arena", startTime = int(self.timeFrame.startTimeVar.get()),
-                         time = int(self.timeFrame.timeVar.get()), boundary = True,
-                         sector = False, shocks = False, origin = origin) # dat do options
-
-
-    def saveRoomFrame(self, cm, origin = (0, 0)):
-        "saves info about room frame in self.svg"
-        self.svg.drawAAPA(cm, frame = "room", startTime = int(self.timeFrame.startTimeVar.get()),
-                         time = int(self.timeFrame.timeVar.get()), boundary = True,
-                         sector = True, shocks = True, origin = origin)
-
-
-    def saveGraph(self, cm, origin = (0, 0)):
-        "saves info about graph in self.svg"
-        size = (600, 120)
-        graph = eval(self.graphTypeVar.get()[:-1] + ', cm, purpose = "svg")')
-        yCoordinates, maxY, furtherText = graph.saveGraph(cm)
-        points = []
-        if yCoordinates:
-            length = len(yCoordinates) - 1
-            for count, y in enumerate(yCoordinates):       
-                points.append(((count * size[0]) / length, size[1] - ((y * size[1]) / maxY)))
-        self.svg.drawGraph(points, furtherText = furtherText, origin = origin, boundary = True)
-
-
     def _returnSelectedFiles(self):
         "returns files that are chosen for creating of images"
         which = self.saveWhichFilesVar.get()

Stuff/Modules/filestorage.py

@@ -752,6 +752,8 @@ def getFiles(self):
             return [], []
         if "}" in filenames and "{" in filenames:
             filenames = filenames[1:-1].split("} {")
+        elif filenames.endswith(")") and filenames.startswith("("):
+            filenames = list(eval(filenames))
         else:
             filenames = [x + ".dat" for x in filenames.split(".dat ")]
             if filenames[-1].endswith(".dat.dat"):