Skip to content

Commit

Permalink
v0.7.8 string escaping and excess printing fixes. Compatible with JPS…
Browse files Browse the repository at this point in the history
…LUtils >=0.7.0
  • Loading branch information
gutow committed Jul 14, 2022
1 parent 51ecbdd commit f1b08bc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions docs/Change_Log.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Change Log
* 0.7.8
* Updated text for insertion into cells to make better use of escaping
updates in JPSLUtils >=0.7.0.
* Removed some unnecessary print statements.
* 0.7.7
* Updated requirements for upstream security fixes.
* Conversion to pandas dataframe now works when trace 0 is not collected.
Expand Down
10 changes: 5 additions & 5 deletions jupyterpidaq/DAQinstance.py
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,9 @@ def collectclick(self, btn):
JPSLUtils.select_containing_cell('LiveRun_'+str(self.idno))
JPSLUtils.new_cell_immediately_below()
cmdstr = 'from jupyterpidaq.DAQinstance import * ' \
'# Does nothing if already imported.\\n' \
'displayRun(' + str(self.idno)+', \\"' \
+ self.svname + '\\") # display the data'
'# Does nothing if already imported.\n' \
'displayRun(' + str(self.idno)+', \"' \
+ self.svname + '\") # display the data'
JPSLUtils.insert_text_into_next_cell(cmdstr)
JPSLUtils.select_containing_cell('LiveRun_'+str(self.idno))
JPSLUtils.select_cell_immediately_below()
Expand Down Expand Up @@ -523,8 +523,8 @@ def fillpandadf(self):
i].units.value + ')')
titles.append(
self.traces[i].tracelbl.value + '_' + 'stdev')
print(str(titles))
print(str(datacolumns))
#print(str(titles))
#print(str(datacolumns))
self.pandadf = pd.DataFrame(np.transpose(datacolumns), columns=titles)

def updatingplot(self):
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
setuptools.setup(
name="JupyterPiDAQ",
url = "https://github.com/JupyterPhysSciLab/JupyterPiDAQ",
version="0.7.7",
version="0.7.8",
description="Data Acquisition in Jupyter notebook on Raspberry Pi",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down Expand Up @@ -35,7 +35,7 @@
'pandas>=1.4.2',
'jupyter-pandas-GUI>=0.6.2.1',
'JPSLMenus>=0.5.0',
'JPSLUtils>=0.6.0',
'JPSLUtils>=0.7.0',
'AdvancedHTMLParser>=9.0.1'
],
classifiers=[
Expand Down

0 comments on commit f1b08bc

Please sign in to comment.