minor styling improvements

maxscheurer · Apr 13, 2018 · 3a257e7 · 3a257e7
1 parent f92de32
commit 3a257e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/PyContact/gui/Plotters.py b/PyContact/gui/Plotters.py
@@ -242,7 +242,8 @@ def plotMap(self, contacts, map1, map2, label1, label2, attribute, threshold, ns
                 r2 = int(c.key2[AccumulationMapIndex.resid])-miny
                 data[r2, r1] = c.hbond_percentage()
 
-        cax = self.axes.matshow(data, cmap=cm.Greys, label=attribute)
+        # cax = self.axes.matshow(data, cmap=cm.Greys, label=attribute)
+        cax = self.axes.matshow(data, label=attribute, cmap="YlGnBu")
 
         # TODO: do this automatically
         stridex = 5

diff --git a/PyContact/gui/statistics.ui b/PyContact/gui/statistics.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>651</width>
-    <height>441</height>
+    <width>930</width>
+    <height>642</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/PyContact/gui/statistics_ui.py b/PyContact/gui/statistics_ui.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'PyContact/gui/statistics.ui'
+# Form implementation generated from reading ui file 'statistics.ui'
 #
-# Created by: PyQt5 UI code generator 5.8
+# Created by: PyQt5 UI code generator 5.6
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,7 +12,7 @@ class Ui_Statistics(object):
     def setupUi(self, Statistics):
         Statistics.setObjectName("Statistics")
         Statistics.setWindowModality(QtCore.Qt.WindowModal)
-        Statistics.resize(651, 441)
+        Statistics.resize(930, 642)
         self.gridLayout = QtWidgets.QGridLayout(Statistics)
         self.gridLayout.setObjectName("gridLayout")
         self.savePlotButton = QtWidgets.QPushButton(Statistics)

diff --git a/setup.py b/setup.py
@@ -6,7 +6,6 @@
 from Cython.Distutils import build_ext
 from Cython.Build import cythonize
 
-import PyContact
 
 extensions = [Extension("PyContact.cy_modules.cy_gridsearch",
                         ["PyContact/cy_modules/cy_gridsearch.pyx"], language="c++",
@@ -42,7 +41,7 @@
     packages=find_packages(),
 
     setup_requires = ['cython'],
-    install_requires = ['numpy','matplotlib','mdanalysis','cython','seaborn'],
+    install_requires = ['numpy','matplotlib','mdanalysis','cython','seaborn', 'scipy'],
     cmdclass = {'build_ext': build_ext},
     ext_modules = cythonize(extensions),