Fixed geometry on mac, deleted invalid variable

Author: MatthewBCooke

SearchStrategyAnalysis/Pathfinder.py

@@ -515,7 +515,7 @@ def buildGUI(self, root):  # Called in the __init__ to build the GUI window
         trunacteFlag = truncate.get()
         rowCount = rowCount + 1
         self.calculateButton = Button(self.paramFrame, text="Calculate", fg="black",
-                                      command=self.mainHelper, state=DISABLED)  # add a button that says calculate
+                                      command=self.mainHelper, state='disabled')  # add a button that says calculate
         self.calculateButton.grid(row=rowCount, column=1, columnspan=1)
         self.settingsButton = Button(self.paramFrame, text="Settings", command=self.settings, fg="black")
         self.settingsButton.grid(row=rowCount, column=0, columnspan=1)  # add custom button
@@ -666,20 +666,16 @@ def detectSoftwareType(self):
                 twoRows = [row for idx, row in enumerate(data) if idx in (0, 1)]
                 if (set(anymaze).issubset(twoRows[0])):
                     softwareStringVar.set("anymaze")
-                    self.calculateButton['state'] = 'normal'
                 if (set(['x', 'y', 't']).issubset(twoRows[1])):
                     softwareStringVar.set("watermaze")
-                    self.calculateButton['state'] = 'normal'
                 if (set(eztrack).issubset(twoRows[0])):
                     softwareStringVar.set("eztrack")
-                    self.calculateButton['state'] = 'normal'
         elif (file_extension == '.xlsx'):
             workbook = open_workbook(theFile)
             sheet = workbook.sheet_by_index(0)
             rowNames = sheet.col_values(0)
             if (set(ethovision).issubset(rowNames)):
                 softwareStringVar.set("ethovision")
-                self.calculateButton['state'] = 'normal'
         else:
             self.callDefineOwnSoftware()
 
@@ -692,7 +688,8 @@ def openFile(self):  # opens a dialog to get a single file
         fileFlag = 1
         fileDirectory = ""
         theFile = filedialog.askopenfilename()  # look for xlsx and xls files
-        self.detectSoftwareType()
+        self.calculateButton['state'] = 'normal'
+        #self.detectSoftwareType()
 
     def openDir(self):  # open dialog to get multiple files
         logging.debug("Open Dir...")
@@ -701,6 +698,7 @@ def openDir(self):  # open dialog to get multiple files
         global fileFlag
         fileFlag = 0
         theFile = ""
+        self.calculateButton['state'] = 'normal'
         fileDirectory = filedialog.askdirectory(mustexist=TRUE)
 
     def generateHeatmap(self, root):
@@ -2040,7 +2038,11 @@ def calculateValues(self, theTrial, goalX, goalY, mazeCentreX, mazeCentreY, corr
 
         startToPlatVector = goalPoint - startPoint
 
-        aArcTangent = math.degrees(math.atan((goalY - startY) / (goalX - startX)))
+        if(goalX-startX != 0):
+            aArcTangent = math.degrees(math.atan((goalY - startY) / (goalX - startX)))
+        else:
+            aArcTangent = 0;
+
         upperCorridor = aArcTangent + corridorWidth
         lowerCorridor = aArcTangent - corridorWidth
         corridorWidth = 0.0
@@ -2118,7 +2120,6 @@ def calculateValues(self, theTrial, goalX, goalY, mazeCentreX, mazeCentreY, corr
         try:
             sampleRate = (theTrial.datapointList[-1].gettime() - startTime) / (len(theTrial.datapointList) - 1)
         except:
-            print("Error with sample rate calculation")
             logging.info("Error with sample rate calculation")
             sampleRate = 1
         while idealDistance > math.ceil(float(goalDiam) / 2):
@@ -2257,21 +2258,23 @@ def mainCalculate(self, goalPosVar=goalPosVar, goalDiamVar=goalDiamVar):
             return
 
         headersToWrite = []
-        if aExperiment.hasDateInfo:
-            headersToWrite.extend(["Date", "Time", "Day"])
-
-        headersToWrite.append("Trial")
-        if aExperiment.hasTrialNames:
-            headersToWrite.append("Name")
-        if aExperiment.hasAnimalNames:
-            headersToWrite.append("Animal")
+        try:
+            if aExperiment.hasDateInfo:
+                headersToWrite.extend(["Date", "Time", "Day"])
 
+            headersToWrite.append("Trial")
+            if aExperiment.hasTrialNames:
+                headersToWrite.append("Name")
+            if aExperiment.hasAnimalNames:
+                headersToWrite.append("Animal")
+        except:
+            pass
         headersToWrite.extend(
             ["Trial Code", "Strategy", "IPE", "Velocity", "Distance covered", "Average distance to goal",
-             "Average heading error", "Percent of maze traversed", "Latency", "Sccore", "Initial heading error",
+             "Average heading error", "Percent of maze traversed", "Latency", "Score", "Initial heading error",
              "Entropy", "Distance to swim path centroid", "Average distance to centre of maze",
              "Percent in angular corridor", "Percent in annulus zone", "Percent in smaller thigmotaxis zone",
-             "Percent in full thigmotaxis zone", "Strategy (manual)", "File"])
+             "Percent in full thigmotaxis zone", "Strategy (manual)"])
         writer.writerow(headersToWrite)  # write to the csv
 
         dayNum = 0
@@ -2465,8 +2468,7 @@ def mainCalculate(self, goalPosVar=goalPosVar, goalDiamVar=goalDiamVar):
                  round(averageHeadingError, 2), round(percentTraversed, 2), round(latency, 2), score,
                  initialHeadingError, round(entropyResult, 2), round(averageDistanceToSwimPathCentroid, 2),
                  round(averageDistanceToCentre, 2), round(corridorAverage, 2), round(annulusCounter / i, 2),
-                 round(smallThigmoCounter / i, 2), round(fullThigmoCounter / i, 2), str(strategyManual),
-                 str(aTrial.getfile())])
+                 round(smallThigmoCounter / i, 2), round(fullThigmoCounter / i, 2), str(strategyManual)])
             writer.writerow(dataToWrite)  # writing to csv file
 
             f.flush()

SearchStrategyAnalysis/appTrial.py

@@ -268,95 +268,6 @@ def getXYT(event):
         top.mainloop()
 
 
-
-'''
-def heatmapSettings(self, top3):
-	        global softwareStringVar
-	        software = softwareStringVar.get()
-	        if software != "ethovision":
-	            return
-	        global canvas
-	        global xscrollbar
-	        global vsb
-	        global frame
-	        global fileDirectory
-	        global heatValues
-	        global flags
-	        global labels
-	
-	        heatValues = []
-	        flags = []
-	        labels = []
-	
-	        extensionType = r"*.xlsx"
-	        try:  # we try to delete a canvas (if one exists this will execute)
-	            deleteCanvas()
-	            logging.info("Canvas destroyed")
-	        except:
-	            logging.debug("Didn't kill canvas, could be first call")
-	
-	        logging.debug("heatmapSettings")
-	
-	        try:
-	
-	            canvas = Canvas(top3, borderwidth=0, width=350, height=800, bg="white")  # we create the canvas
-	            frame = Frame(canvas)  # we place a frame in the canvas
-	            frame.configure(bg="white")
-	            xscrollbar = Scrollbar(top3, orient=HORIZONTAL, command=canvas.xview)  # we add a horizontal scroll bar
-	            xscrollbar.pack(side=BOTTOM, fill=X)  # we put the horizontal scroll bar on the bottom
-	            vsb = Scrollbar(top3, orient="vertical", command=canvas.yview)  # vertical scroll bar
-	            vsb.pack(side="right", fill="y")  # put on right
-	
-	            canvas.pack(side="left", fill="both", expand=True)  # we pack in the canvas
-	            canvas.create_window((4, 4), window=frame, anchor="nw")  # we create the window for the results
-	
-	            canvas.configure(yscrollcommand=vsb.set)  # we set the commands for the scroll bars
-	            canvas.configure(xscrollcommand=xscrollbar.set)
-	            frame.bind("<Configure>", lambda event, canvas=canvas: self.onFrameConfigure(canvas))   # we bind on frame configure
-	        except:
-	            logging.critical("Couldn't create the CSV canvas")
-	
-	        try:  # we try and fill the canvas
-	            logging.debug("Populating the canvas")
-	            for aFile in self.find_files(fileDirectory, extensionType):
-	                try:
-	                    wb = open_workbook(aFile)
-	                    logging.debug("Opened" + aFile)
-	                except:
-	                    logging.error("Could not open excel file: " + aFile)
-	                    continue
-	
-	                for sheet in wb.sheets():  # for all sheets in the workbook
-	                    for row in range(38):  # GET CONDITION TREATMENT AND DAY VALUES
-	                        for col in range(2):
-	                            if str(sheet.cell(row, 0).value) != "":
-	                                if col == 0:
-	                                    labels.append(str(sheet.cell(row, 0).value))
-	                                    heatmapValueFlag = BooleanVar()
-	                                    heatmapValueFlag.set(False)
-	                                    button = Checkbutton(frame, width=30, height=1, \
-	                                                    text=str(sheet.cell(row, col).value), relief=RAISED, bg="white", variable=heatmapValueFlag)
-	                                    button.grid(row=row, column=col)
-	                                    flags.append(heatmapValueFlag)
-	                                else:
-	                                    value = StringVar()
-	                                    value.set(str(sheet.cell(row, col).value))
-	                                    label = Entry(frame, width=30, textvariable=value)
-	                                    label.grid(row=row, column=col)
-	                                    heatValues.append(value)
-	                return
-	
-	        except Exception:  # if we can't fill
-	            logging.critical("Fatal error in populate")
-	
-
-'''
-
-
-
-
-
-
 def saveFileAsExperiment(software, filename, filedirectory):
     trialList = []
     filenameList = []