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

Python 3 and QT5 compatibility #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python 3 and QT5 compatibility #7

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Temp Files
*~
.\__pycache__\*

# emacs
# dot hash files (write locks)
Expand Down
16 changes: 8 additions & 8 deletions dos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class kmodule():
"""KiCad module."""

def __init__(self, fname):
self.fout = open(fname, 'w')
self.fout = open(fname[0], 'w')

def write_header(self, name='SIND', descr='spiral inductor', tags='SMD'):
self.fout.write('(module %s (layer F.Cu)\n' % name)
Expand Down Expand Up @@ -325,7 +325,7 @@ def readZc():
# take real and imag parts
pair = re.compile(r' *(\S+) +(\S+)j')
for ridx in range(nrows):
lin = fzc.next()
lin = fzc.readline()
# parse all complex data pairs
celms = pair.findall(lin)
matr = []
Expand Down Expand Up @@ -584,11 +584,11 @@ def arcs_spiral(N_turns, r_in, pitch, dir, N):
din = 2 * r_in - tr_w + pitch / 2.0
dout = 2 * r_in + (2 * N_turns - 0.5) * pitch + tr_w
ind = calc_ind(N_turns, dout / 1e3, din / 1e3)
print 'din =', din
print 'dout =', dout
print 'ind =', ind
print('din =', din)
print('dout =', dout)
print('ind =', ind)
k = calc_mut(N_turns, PCB_h)
print 'mutual ind =', k * ind, k
print('mutual ind =', k * ind, k)

draw_arcs_spiral(N_turns, r_in, pitch, tr_w, N, -dir)
sf.add_ports()
Expand All @@ -604,5 +604,5 @@ def arcs_spiral(N_turns, r_in, pitch, dir, N):
sf.run()

freqs, mats = sf.readZc()
print freqs
print mats
print(freqs)
print(mats)
34 changes: 17 additions & 17 deletions spiki.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
if (useNLopt):
from numpy import * # needed by nlopt

from PyQt4 import QtGui, uic
from PyQt4.QtCore import QThread
from PyQt5 import QtGui, QtWidgets, uic
from PyQt5.QtCore import QThread

import dos

Expand All @@ -28,7 +28,7 @@ def __init__(self):
self.setupUi(self)

# File
self.actionExit.triggered.connect(QtGui.qApp.quit)
self.actionExit.triggered.connect(QtWidgets.qApp.quit)
self.actionSave_module.triggered.connect(self.writeModule)

# add validators to LineEdits
Expand Down Expand Up @@ -117,7 +117,7 @@ def updateSkinDepth(self):
def runSimulation(self):
self.statusBar().showMessage("Simulating...")
# update GUI to show changes status bar message
QtGui.QApplication.processEvents()
QtWidgets.QApplication.processEvents()
self.simulate()
self.statusBar().showMessage("Ready.")

Expand Down Expand Up @@ -207,7 +207,7 @@ def simulate(self):
def runOptimization(self):
self.statusBar().showMessage("Optimizing...")
# update GUI to show changes status bar message
QtGui.QApplication.processEvents()
QtWidgets.QApplication.processEvents()

nTurns = float(self.nTurnsLineEdit.text())
innerRadius = float(self.innerRadiusLineEdit.text())
Expand All @@ -223,7 +223,7 @@ def errfunc(x, grad):
if grad.size > 0:
grad = Null
self.spacingLineEdit.setText(str(x[0]))
QtGui.QApplication.processEvents() # update GUI
QtWidgets.QApplication.processEvents() # update GUI
ind = self.simulate()
err = math.fabs(ind - targetInd)
return err
Expand All @@ -235,20 +235,20 @@ def errfunc(x, grad):
opt.set_xtol_rel(1e-2)
x = opt.optimize([spacing])
minf = opt.last_optimum_value()
print "optimum at ", x[0]
print "minimum value = ", minf
print "result code = ", opt.last_optimize_result()
print("optimum at ", x[0])
print("minimum value = ", minf)
print("result code = ", opt.last_optimize_result())

self.spacingLineEdit.setText(str(x[0]))

self.statusBar().showMessage("Ready.")

def writeModule(self):
fname = QtGui.QFileDialog.getSaveFileName(self, 'Save Module', '.', 'Footprint (*.kicad_mod);;Any File (*)')
def writeModule(self):
fname = QtWidgets.QFileDialog.getSaveFileName(self, 'Save Module', '.', 'Footprint (*.kicad_mod);;Any File (*)')
if (not fname):
return
if (not fname.endsWith('.kicad_mod')):
fname = fname + '.kicad_mod'
if (not fname[0].endswith('.kicad_mod')):
fname[0] = fname[0] + '.kicad_mod'

nTurns = float(self.nTurnsLineEdit.text())
innerRadius = float(self.innerRadiusLineEdit.text())
Expand Down Expand Up @@ -325,9 +325,9 @@ def estimateInductance(self):
din = 2 * innerRadius - traceWidth + pitch / 2.0
dout = 2 * innerRadius + (2 * nTurns - 0.5) * pitch + traceWidth
ind = dos.calc_ind(nTurns, dout / 1e3, din / 1e3)
# print 'din =', din
# print 'dout =', dout
# print 'ind =', ind
# print('din =', din)
# print('dout =', dout)
# print('ind =', ind)

if (nLayers == 1):
indtot = ind # single-lyer inductor
Expand All @@ -339,7 +339,7 @@ def estimateInductance(self):


def main():
app = QtGui.QApplication(sys.argv)
app = QtWidgets.QApplication(sys.argv)
form = kSpiralCalc()
form.show()
app.exec_()
Expand Down