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.

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

Display up to 4 channels and export to CSV #3

Merged
merged 4 commits into from
Jun 21, 2017

Conversation

Padoup-Padoup
Copy link

I made a few modifications as follows:

  • Allow to export a simple CSV file
  • Take into account the time range when plotting
  • Display up to 4 channels (this is useful for instance when handling Tek 2014 scopes)

I would be happy to make revisions of the code and updates if needed. Note that this PR addresses issues . #1 and #2. Let me know if I can do anything to improve it!

@@ -96,7 +96,7 @@ def get_xdata(self):
self.write("HORIZONTAL:RECORDLENGTH?")
time_size = int(self.read(30))

time = numpy.arange(0,timescale*10,timescale*10/time_size)
time = numpy.arange(0,timescale*10,timescale*10/time_size*2) # For some reason the output was too short compared to the data buffer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be scope-dependent, I'll look into it, but am merging for now. There is a better way to get the record length directly from the scope and that is how it should be done in an instrument-neutral way.

Copy link
Contributor

@amcdawes amcdawes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These look good, thank you for the PR

@amcdawes amcdawes merged commit 65b1331 into DawesLab:master Jun 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants