Skip to content

Commit

Permalink
attempt to load/solve files in real time. added icon. updated windows…
Browse files Browse the repository at this point in the history
… build script
  • Loading branch information
grey committed Apr 11, 2014
1 parent 01f0d92 commit 602e8af
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
9 changes: 3 additions & 6 deletions batch-iv-analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,6 @@ def openCall(self):
print "computing: "+ fileName
for ii in range(len(self.cols)):
self.ui.tableWidget.setItem(self.rows,ii,QTableWidgetItem())

self.ui.tableWidget.item(self.rows,self.cols.keys().index('file')).setText(fileName)


#do a thing here:
#grab the area out of the header section of the data file
Expand All @@ -364,8 +361,6 @@ def openCall(self):
fp.close()
area = float(header[14].split(' ')[3])

self.ui.tableWidget.item(self.rows,self.cols.keys().index('file')).setToolTip(''.join(header))

def evaluateGuessPlot(dataX, dataY, myguess):
myguess = [float(x) for x in myguess]
print "myguess:"
Expand Down Expand Up @@ -611,7 +606,9 @@ def invCellPowerSpline(voltageIn):
splineY = iFitSpline(fitX)
self.graphData.append({'origRow':self.rows,'lowerI':lowerI,'upperI':upperI,'fitX':fitX,'modelY':modelY,'splineY':splineY,'i':II,'v':VV,'Voc':Voc_nn,'Isc':Isc_nn,'Vmax':vMax,'Imax':iMax})



self.ui.tableWidget.item(self.rows,self.cols.keys().index('file')).setText(fileName)
self.ui.tableWidget.item(self.rows,self.cols.keys().index('file')).setToolTip(''.join(header))
self.ui.tableWidget.item(self.rows,self.cols.keys().index('pce')).setData(Qt.DisplayRole,float(pMax/area*1e3).__format__('.3f'))
self.ui.tableWidget.item(self.rows,self.cols.keys().index('pmax')).setData(Qt.DisplayRole,float(pMax/area*1e3).__format__('.3f'))
self.ui.tableWidget.item(self.rows,self.cols.keys().index('jsc')).setData(Qt.DisplayRole,float(Isc_nn/area*1e3).__format__('.3f'))
Expand Down
Binary file added icon.ico
Binary file not shown.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from cx_Freeze import setup, Executable

# Dependencies are automatically detected, but it might need fine tuning.
build_exe_options = {"packages": ["os","scipy.sparse.linalg","scipy.sparse.csgraph","scipy.special","matplotlib.backends.backend_tkagg","matplotlib.backends.backend_qt4agg"], "excludes": ["tkinter","sympy"]}
build_exe_options = {"packages": ["os","scipy.integrate.lsoda","scipy.integrate.vode","scipy.sparse.linalg","scipy.special._ufuncs","scipy.sparse.csgraph","scipy.special","PyQt4.QtCore","PyQt4.QtGui","matplotlib.backends.backend_tkagg","matplotlib.backends.backend_qt4agg"], "excludes": ["tkinter"]}

# GUI applications require a different base on Windows (the default is for a
# console application).
Expand All @@ -14,4 +14,4 @@
version = "1.0",
description = "Batch curve fitting tool for data files generated by the McGehee LabVIEW IV curve taker",
options = {"build_exe": build_exe_options},
executables = [Executable("batch-iv-analysis.py", base=base)])
executables = [Executable("batch-iv-analysis.py", base=base,icon="icon.ico")])

0 comments on commit 602e8af

Please sign in to comment.