Skip to content

verbose printing #39

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

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

verbose printing #39

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
23 changes: 17 additions & 6 deletions spc/spc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,18 @@ class File:
# CONSTRUCTOR
# ------------------------------------------------------------------------

def __init__(self, filename):
def __init__(self, filename, verbose= True):

# specify if the format string should be printed
if verbose:
def verboseprint(*args):
# Print each argument separately so caller doesn't need to
# stuff everything to be printed into a single string
for arg in args:
print(arg)
else:
verboseprint = lambda *a: None # do-nothing function

# load entire into memory temporarly
with open(filename, "rb") as fin:
content = fin.read()
Expand Down Expand Up @@ -156,7 +167,7 @@ def __init__(self, filename):
# no x values are given, but they can be generated
self.dat_fmt = 'gx-y'

print('{}({})'.format(self.dat_fmt, self.fnsub))
verboseprint('{}({})'.format(self.dat_fmt, self.fnsub))

sub_pos = self.head_siz

Expand Down Expand Up @@ -252,7 +263,7 @@ def __init__(self, filename):
# --------------------------------------------
elif self.fversn == b'\x4c':
# new MSB 1st
print("New MSB 1st, yet to be implemented")
verboseprint("New MSB 1st, yet to be implemented")
pass # To be implemented

# --------------------------------------------
Expand Down Expand Up @@ -360,7 +371,7 @@ def __init__(self, filename):

# assuming it can't have separate x values
self.dat_fmt = 'gx-y'
print('{}({})'.format(self.dat_fmt, self.fnsub))
verboseprint('{}({})'.format(self.dat_fmt, self.fnsub))

self.fxtype = ord(self.fxtype)
self.fytype = ord(self.fytype)
Expand All @@ -372,7 +383,7 @@ def __init__(self, filename):
# SHIMADZU
# --------------------------------------------
elif self.fversn == b'\xcf':
print("Highly experimental format, may not work ")
verboseprint("Highly experimental format, may not work ")
raw_data = content[10240:] # data starts here (maybe every time)
# spacing between y and x data is atleast 0 bytes
s_32 = chr(int('0', 2)) * 32
Expand All @@ -387,7 +398,7 @@ def __init__(self, filename):
self.x = struct.unpack(('<' + dat_siz * 'd').encode('utf8'), raw_data[i:i + dat_len])

else:
print("File type %s not supported yet. Please add issue. "
verboseprint("File type %s not supported yet. Please add issue. "
% hex(ord(self.fversn)))
self.content = content

Expand Down