err

PeterDulworth · Jun 19, 2017 · 3c3eda2 · 3c3eda2
1 parent bf16cd1
commit 3c3eda2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/main.py b/main.py
@@ -203,20 +203,16 @@ def updatedDisplayWindows(self, btnClicked=None):
                 if self.checkboxDonutPlot.isChecked():
                     donut_colors = tf.donut_colors(top_topologies_to_counts, topologies_to_colors)  # donut
                     tf.topology_donut(num, list_of_top_counts, labels, sizes, donut_colors)  # donut
-                    self.displayResults()
 
                 if self.checkboxScatterPlot.isChecked():
                     tf.topology_scatter(windows_to_top_topologies, scatter_colors, ylist)  # scatter
-                    self.displayResults()
 
                 if self.checkboxAllTrees.isChecked():
                     tf.topology_colorizer(topologies_to_colors)  # all trees
-                    self.displayResults()
 
                 if self.checkboxCircleGraph.isChecked():
                     circleGraphGenerator.generateCircleGraph(self.input_file_name, windows_to_top_topologies,
                                                              topologies_to_colors, self.window_size, self.window_offset)
-                    self.displayResults()
 
                 if self.checkboxStatistics.isChecked():
                     if self.robinsonFoulds:
@@ -234,7 +230,7 @@ def updatedDisplayWindows(self, btnClicked=None):
                         # Function calls for calculating statistics
                         windows_to_p_gtst = sc.calculate_windows_to_p_gtst(self.speciesTree)
                         sc.stat_scatter(windows_to_p_gtst, "PGTST")
-                    self.displayResults()
+                self.displayResults()
 
     def setWindow(self, window):
         self.stackedWidget.setCurrentIndex(self.windows[window])

diff --git a/outputWindows/scatterPlotWindow.py b/outputWindows/scatterPlotWindow.py
@@ -9,9 +9,9 @@ def __init__(self, parent=None):
         self.setupUi(self)
 
     def display_image(self):
-        standardSize = Image.open("topologyPlot.png").size
+        standardSize = Image.open("topologyScatter.png").size
 
         self.move(800, 600)
         self.scatterPlotImage.setScaledContents(True)
-        self.scatterPlotImage.setPixmap(QtGui.QPixmap("topologyPlot.png"))
+        self.scatterPlotImage.setPixmap(QtGui.QPixmap("topologyScatter.png"))
         self.resize(int(standardSize[0]), int(standardSize[1]))