Unused imports removed + sort bug fix

acshu · Oct 14, 2013 · 65dcabd · 65dcabd
1 parent e137ac1
commit 65dcabd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/lib/FormParams.py b/lib/FormParams.py
@@ -1,7 +1,7 @@
 from _ast import List
 from PyQt4.QtCore import Qt, pyqtSignal
-from PyQt4.QtGui import QDoubleSpinBox, QLabel, QWidget, QComboBox, QFont, QGroupBox, QTextEdit, QFrame, QCheckBox
-from matplotlib.backends.qt4_editor.formlayout import QPushButton, QDialog, QGridLayout, QVBoxLayout, QHBoxLayout, QLineEdit
+from PyQt4.QtGui import QDoubleSpinBox, QLabel, QWidget, QComboBox, QFont, QFrame, QCheckBox
+from matplotlib.backends.qt4_editor.formlayout import QPushButton, QDialog, QGridLayout, QVBoxLayout, QHBoxLayout
 from lib.Utils import frange, Constants, add_triplet
 
 

diff --git a/lib/Layout.py b/lib/Layout.py
@@ -10,16 +10,12 @@
 import csv
 from PyQt4.QtCore import Qt, pyqtSignal, QString, QAbstractTableModel, QVariant, QEvent
 
-from PyQt4.QtGui import QWidget, QHBoxLayout, QVBoxLayout, QPushButton, QProgressBar, QGridLayout, QLabel, QCheckBox, QFileDialog, QMessageBox, QTabWidget, QLineEdit, QPalette, QSizePolicy, QColor, QTableWidget, QAbstractItemView, QMenu, QTableWidgetItem, QTableView, QAction, QGraphicsOpacityEffect
+from PyQt4.QtGui import QWidget, QHBoxLayout, QVBoxLayout, QPushButton, QProgressBar, QGridLayout, QLabel, QCheckBox, QFileDialog, QMessageBox, QTabWidget, QLineEdit, QPalette, QSizePolicy, QColor, QTableWidget, QAbstractItemView, QMenu, QTableWidgetItem, QTableView, QAction
 import math
 import gc
 from matplotlib import rcParams
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.figure import Figure
-from matplotlib.mlab import detrend_mean
-import numpy
-from scipy.signal.signaltools import detrend
-from sympy.ntheory.partitions_ import npartitions
 from lib.Structures import Global, TaskRange
 from lib.Utils import Constants, TaskImporter, flip_phase_list, uc_variable_name
 from lib.FormParams import *
@@ -1247,7 +1243,7 @@ def _on_tasks_list_updated(self):
             self.last_scroll_position = self.verticalScrollBar().sliderPosition()
 
         self.setModel(ResultsTableModel(Global.tasks()))
-        self.sortByColumn(self.last_sort_column, self.last_sort_column)
+        self.sortByColumn(self.last_sort_column, self.last_sort_order)
         self.resizeColumnsToContents()
         self.horizontalHeader().setStretchLastSection(True)
         self.selectRow(self.last_selected_row)

diff --git a/lib/Structures.py b/lib/Structures.py
@@ -1,7 +1,4 @@
-from copy import copy
 import hashlib
-from itertools import combinations
-import md5
 import marshal
 from numpy import random
 from PyQt4.QtCore import pyqtSignal, QObject, QThread