diff --git a/example.py b/example.py new file mode 100644 index 0000000..1be252f --- /dev/null +++ b/example.py @@ -0,0 +1,6 @@ +import tdm_ripper + +tdmpath = b"samples/SineData.tdm" +tdxpath = b"samples/SineData.tdx" + +tdm_ripper.pytdmripper(tdmpath) diff --git a/pytdm_ripper.pyx b/pytdm_ripper.pyx index 1aba3ce..0f64c2e 100644 --- a/pytdm_ripper.pyx +++ b/pytdm_ripper.pyx @@ -10,8 +10,8 @@ cdef class pytdmripper: # use pointer since there's no nullary constructor cdef tdm_ripper*cripp - def __cinit__(self, string tdmfile, string tdxfile): - self.cripp = new tdm_ripper(tdmfile,tdxfile) + def __cinit__(self, string tdmfile): + self.cripp = new tdm_ripper(tdmfile) def __dealloc__(self): del self.cripp diff --git a/samples/SineData.tdm b/samples/SineData.tdm new file mode 100755 index 0000000..5afa0fd --- /dev/null +++ b/samples/SineData.tdm @@ -0,0 +1,369 @@ + + + + + National Instruments USI + 1.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SineData.TDM + Sine signals of various amplitudes and frequencies. + SineData + National Instruments + 2008-05-06T17:20:12.65074539184570313 + #xpointer(id("usi12") id("usi13")) + + + Amplitudes + Sine Signals of various amplitudes. + #xpointer(id("usi11")) + + 1 + + #xpointer(id("usi14") id("usi15") id("usi16") id("usi17") id("usi18")) + #xpointer(id("usi24") id("usi25") id("usi26") id("usi27") id("usi28")) + + + Frequencies + Sine signals of various frequencies. + #xpointer(id("usi11")) + + 1 + + #xpointer(id("usi19") id("usi20") id("usi21") id("usi22") id("usi23")) + #xpointer(id("usi29") id("usi30") id("usi31") id("usi32") id("usi33")) + + + A = 1 + #xpointer(id("usi12")) + DT_DOUBLE + -0.999997146387718 + 0.999999682931835 + + 0 + 1000 + 10 + + #xpointer(id("usi34")) + + + A = 2 + #xpointer(id("usi12")) + DT_DOUBLE + -1.99999429277544 + 1.99999936586367 + + 1 + 1000 + 10 + + #xpointer(id("usi35")) + + + A = 4 + #xpointer(id("usi12")) + DT_DOUBLE + -3.99998858555087 + 3.99999873172734 + + 2 + 1000 + 10 + + #xpointer(id("usi36")) + + + A = 8 + #xpointer(id("usi12")) + DT_DOUBLE + -7.99997717110174 + 7.99999746345468 + + 3 + 1000 + 10 + + #xpointer(id("usi37")) + + + A = 16 + #xpointer(id("usi12")) + DT_DOUBLE + -15.9999543422035 + 15.9999949269094 + + 4 + 1000 + 10 + + #xpointer(id("usi38")) + + + F = 1 + #xpointer(id("usi13")) + DT_DOUBLE + -0.999997146387718 + 0.999999682931835 + + 0 + 1000 + 10 + + #xpointer(id("usi39")) + + + F = 2 + #xpointer(id("usi13")) + DT_DOUBLE + -0.999999230697499 + 0.999995986891472 + + 1 + 1000 + 10 + + #xpointer(id("usi40")) + + + F = 4 + #xpointer(id("usi13")) + DT_DOUBLE + -0.999999230697499 + 0.99994907791452 + + 2 + 1000 + 10 + + #xpointer(id("usi41")) + + + F = 8 + #xpointer(id("usi13")) + DT_DOUBLE + -0.999999230697499 + 0.999996490345607 + + 3 + 1000 + 10 + + #xpointer(id("usi42")) + + + F = 16 + #xpointer(id("usi13")) + DT_DOUBLE + -0.999999230697499 + 0.999993076284592 + + 4 + 1000 + 10 + + #xpointer(id("usi43")) + + + Untitled + #xpointer(id("usi12")) + 1000 + #xpointer(id("usi34")) + + + Untitled + #xpointer(id("usi12")) + 1000 + #xpointer(id("usi35")) + + + Untitled + #xpointer(id("usi12")) + 1000 + #xpointer(id("usi36")) + + + Untitled + #xpointer(id("usi12")) + 1000 + #xpointer(id("usi37")) + + + Untitled + #xpointer(id("usi12")) + 1000 + #xpointer(id("usi38")) + + + Untitled + #xpointer(id("usi13")) + 1000 + #xpointer(id("usi39")) + + + Untitled + #xpointer(id("usi13")) + 1000 + #xpointer(id("usi40")) + + + Untitled + #xpointer(id("usi13")) + 1000 + #xpointer(id("usi41")) + + + Untitled + #xpointer(id("usi13")) + 1000 + #xpointer(id("usi42")) + + + Untitled + #xpointer(id("usi13")) + 1000 + #xpointer(id("usi43")) + + + Untitled + #xpointer(id("usi14")) + #xpointer(id("usi24")) + 15 + 0 + explicit + #xpointer(id("usi1")) + + + Untitled + #xpointer(id("usi15")) + #xpointer(id("usi25")) + 15 + 0 + explicit + #xpointer(id("usi2")) + + + Untitled + #xpointer(id("usi16")) + #xpointer(id("usi26")) + 15 + 0 + explicit + #xpointer(id("usi3")) + + + Untitled + #xpointer(id("usi17")) + #xpointer(id("usi27")) + 15 + 0 + explicit + #xpointer(id("usi4")) + + + Untitled + #xpointer(id("usi18")) + #xpointer(id("usi28")) + 15 + 0 + explicit + #xpointer(id("usi5")) + + + Untitled + #xpointer(id("usi19")) + #xpointer(id("usi29")) + 15 + 0 + explicit + #xpointer(id("usi6")) + + + Untitled + #xpointer(id("usi20")) + #xpointer(id("usi30")) + 15 + 0 + explicit + #xpointer(id("usi7")) + + + Untitled + #xpointer(id("usi21")) + #xpointer(id("usi31")) + 15 + 0 + explicit + #xpointer(id("usi8")) + + + Untitled + #xpointer(id("usi22")) + #xpointer(id("usi32")) + 15 + 0 + explicit + #xpointer(id("usi9")) + + + Untitled + #xpointer(id("usi23")) + #xpointer(id("usi33")) + 15 + 0 + explicit + #xpointer(id("usi10")) + + + + diff --git a/samples/SineData.tdx b/samples/SineData.tdx new file mode 100755 index 0000000..4a7a9e3 Binary files /dev/null and b/samples/SineData.tdx differ diff --git a/setup.py b/setup.py index d583dbf..8b277f5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from Cython.Build import cythonize extensions = Extension( name="tdm_ripper", sources=["pytdm_ripper.pyx"], #,"lib/tdm_ripper.cpp"], - # libraries=["tdm_ripper"], + # libraries=[""], library_dirs=["lib"], include_dirs=["lib"], language='c++', diff --git a/tdm_ripper.pxd b/tdm_ripper.pxd index 1775814..defedef 100644 --- a/tdm_ripper.pxd +++ b/tdm_ripper.pxd @@ -9,6 +9,6 @@ cdef extern from "tdm_ripper.cpp": cdef extern from "tdm_ripper.hpp": cdef cppclass tdm_ripper: # tdm_ripper() except + - tdm_ripper(string, string) except + + tdm_ripper(string) except + # void setfiles(string, string) # void setup()