Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: dont depend on qtpy #8

Merged
merged 1 commit into from
Mar 21, 2017
Merged

fix: dont depend on qtpy #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qcodes/plots/pyqtgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np
import pyqtgraph as pg
import pyqtgraph.multiprocess as pgmp
from qtpy import QtWidgets
from pyqtgraph import QtGui # note that pyqtgraph still uses the old pyqt4 layout
import warnings
from collections import namedtuple

Expand Down Expand Up @@ -65,7 +65,7 @@ def __init__(self, *args, figsize=(1000, 600), interval=0.25,
self.win.setBackground(theme[1])
self.win.resize(*figsize)
if fig_x_position:
_, _, width, height = QtWidgets.QDesktopWidget().screenGeometry().getCoords()
_, _, width, height = QtGui.QDesktopWidget().screenGeometry().getCoords()
y_pos = self.win.y()
self.win.move(width * fig_x_position, y_pos)
self.subplots = [self.add_subplot()]
Expand Down
1 change: 0 additions & 1 deletion qcodes/utils/wrappers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from os.path import sep
from os import makedirs
import logging
from qtpy import QtWidgets

from qcodes.plots.pyqtgraph import QtPlot
from qcodes.plots.qcmatplotlib import MatPlot
Expand Down