ndicapi 3.7.2__tar.gz → 3.7.4__tar.gz

{ndicapi-3.7.2 → ndicapi-3.7.4}/CMakeLists.txt

@@ -1,7 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 4.0.0)
 PROJECT(ndicapi)
-CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0)
 
-SET(ndicapi_VERSION 3.7.2)
+SET(ndicapi_VERSION 3.7.4)
 
 # --------------------------------------------------------------------------
 # Configure output paths for libraries and executables.
@@ -65,20 +65,6 @@ IF(BUILD_PYTHON)
       " shared library (CMake option BUILD_SHARED_LIBS)."
       )
   ENDIF()
-  SET(SETUP_PY_FILEPATH ${CMAKE_CURRENT_SOURCE_DIR}/setup.py)
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
-    ${SETUP_PY_FILEPATH}
-    )
-  MESSAGE(
-    "Successfully generated ${SETUP_PY_FILEPATH} for the Python"
-    " extension module. To install the Python extension module:"
-    "\n\t0) Install the C++ library: make && make install"
-    " (might need admin access)"
-    "\n\t1) Go to ${CMAKE_CURRENT_SOURCE_DIR}"
-    "\n\t2) Build and install the Python extension:"
-    " python setup.py install (might require admin access)"
-    )
 ENDIF()
 
 FIND_PACKAGE(Threads)

{ndicapi-3.7.2 → ndicapi-3.7.4}/MANIFEST.in

@@ -1,8 +1,6 @@
 include *.cxx
 include *.h
 include README.pypi.md
-include ndicapiExport.h.in
 include CMakeLists.txt
 include ndicapiConfig.cmake.in
 include ndicapiConfigVersion.cmake.in
-include ndicapiExport.h.in

{ndicapi-3.7.2/ndicapi.egg-info → ndicapi-3.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ndicapi
-Version: 3.7.2
+Version: 3.7.4
 Summary: This package allows interfacing with NDI tracking devices
 Home-page: https://github.com/SciKit-Surgery/ndicapi
 Maintainer: Stephen Thompson
@@ -17,16 +17,26 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: System :: Hardware
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: summary
 
 # History
 * Program:   NDI Combined API C Interface Library

{ndicapi-3.7.2 → ndicapi-3.7.4/ndicapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ndicapi
-Version: 3.7.2
+Version: 3.7.4
 Summary: This package allows interfacing with NDI tracking devices
 Home-page: https://github.com/SciKit-Surgery/ndicapi
 Maintainer: Stephen Thompson
@@ -17,16 +17,26 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: System :: Hardware
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: summary
 
 # History
 * Program:   NDI Combined API C Interface Library

{ndicapi-3.7.2 → ndicapi-3.7.4}/ndicapi.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ ndicapi.h
 ndicapiConfig.cmake.in
 ndicapiConfigVersion.cmake.in
 ndicapiExport.h
-ndicapiExport.h.in
 ndicapi_math.cxx
 ndicapi_math.h
 ndicapi_serial.cxx

{ndicapi-3.7.2 → ndicapi-3.7.4}/ndicapiExport.h

@@ -12,8 +12,6 @@
 #ifndef __ndicapiExport_h
 #define __ndicapiExport_h
 
-/* #undef ndicapi_STATIC */
-
 #if defined(WIN32) && !defined(ndicapi_STATIC)
  #if defined(ndicapi_EXPORTS)
   #define ndicapiExport __declspec( dllexport )

{ndicapi-3.7.2 → ndicapi-3.7.4}/ndicapimodule.cxx

@@ -1175,6 +1175,37 @@ static PyObject* Py_ndiGetTXFrame(PyObject* module, PyObject* args)
   return NULL;
 }
 
+static PyObject* Py_ndiGetTXNumberOfPassiveStrays(PyObject* module,
+    PyObject* args)
+{
+  int result;
+  ndicapi* pol;
+
+  if (PyArg_ParseTuple(args, "O&:plGetTXNumberOfPassiveStrays",
+                       &_ndiConverter, &pol))
+  {
+    result = ndiGetTXNumberOfPassiveStrays(pol);
+    return PyInt_FromLong(result);
+  }
+
+  return NULL;
+}
+
+static PyObject* Py_ndiGetBXNumberOfPassiveStrays(PyObject* module,
+    PyObject* args)
+{
+  int result;
+  ndicapi* pol;
+
+  if (PyArg_ParseTuple(args, "O&:plGetBXNumberOfPassiveStrays",
+                       &_ndiConverter, &pol))
+  {
+    result = ndiGetBXNumberOfPassiveStrays(pol);
+    return PyInt_FromLong(result);
+  }
+
+  return NULL;
+}
 
 static PyObject* Py_ndiGetGXNumberOfPassiveStrays(PyObject* module,
     PyObject* args)
@@ -1219,6 +1250,60 @@ static PyObject* Py_ndiGetGXPassiveStray(PyObject* module, PyObject* args)
   return NULL;
 }
 
+static PyObject* Py_ndiGetBXPassiveStray(PyObject* module, PyObject* args)
+{
+  int result;
+  int i;
+  float coord[3];
+  ndicapi* pol;
+
+  if (PyArg_ParseTuple(args, "O&i:plGetBXPassiveStray",
+                       &_ndiConverter, &pol, &i))
+  {
+    result = ndiGetBXPassiveStray(pol, i, coord);
+
+    if (result == NDI_MISSING)
+    {
+      return PyString_FromString("MISSING");
+    }
+    else if (result == NDI_DISABLED)
+    {
+      return PyString_FromString("DISABLED");
+    }
+
+    return Py_BuildValue("(ddd)", coord[0], coord[1], coord[2]);
+  }
+
+  return NULL;
+}
+
+static PyObject* Py_ndiGetTXPassiveStray(PyObject* module, PyObject* args)
+{
+  int result;
+  int i;
+  double coord[3];
+  ndicapi* pol;
+
+  if (PyArg_ParseTuple(args, "O&i:plGetTXPassiveStray",
+                       &_ndiConverter, &pol, &i))
+  {
+    result = ndiGetTXPassiveStray(pol, i, coord);
+
+    if (result == NDI_MISSING)
+    {
+      return PyString_FromString("MISSING");
+    }
+    else if (result == NDI_DISABLED)
+    {
+      return PyString_FromString("DISABLED");
+    }
+
+    return Py_BuildValue("(ddd)", coord[0], coord[1], coord[2]);
+  }
+
+  return NULL;
+}
+
 static PyObject* Py_ndiGetPSTATPortStatus(PyObject* module, PyObject* args)
 {
   char port;
@@ -1657,8 +1742,8 @@ static PyMethodDef NdicapiMethods[] =
   //Py_NDIMethodMacro(ndiGetBXMarkerInfo),
   //Py_NDIMethodMacro(ndiGetBXSingleStray),
   Py_NDIMethodMacro(ndiGetBXFrame),
-  //Py_NDIMethodMacro(ndiGetBXNumberOfPassiveStrays),
-  //Py_NDIMethodMacro(ndiGetBXPassiveStray),
+  Py_NDIMethodMacro(ndiGetBXNumberOfPassiveStrays),
+  Py_NDIMethodMacro(ndiGetBXPassiveStray),
 
   Py_NDIMethodMacro(ndiTX),
 
@@ -1669,8 +1754,8 @@ static PyMethodDef NdicapiMethods[] =
   //Py_NDIMethodMacro(ndiGetTXMarkerInfo),
   //Py_NDIMethodMacro(ndiGetTXSingleStray),
   Py_NDIMethodMacro(ndiGetTXFrame),
-  //Py_NDIMethodMacro(ndiGetTXNumberOfPassiveStrays),
-  //Py_NDIMethodMacro(ndiGetTXPassiveStray),
+  Py_NDIMethodMacro(ndiGetTXNumberOfPassiveStrays),
+  Py_NDIMethodMacro(ndiGetTXPassiveStray),
 
 
   Py_NDIMethodMacro(ndiLED),

{ndicapi-3.7.2 → ndicapi-3.7.4}/setup.py

@@ -32,7 +32,7 @@ ndicapy = setuptools.Extension('ndicapy',
                     )
 
 setuptools.setup(name='ndicapi',
-      version='3.7.2',
+      version='3.7.4',
       url='https://github.com/SciKit-Surgery/ndicapi',
       license='MIT',
       description='This package allows interfacing with NDI tracking devices',
@@ -52,10 +52,11 @@ setuptools.setup(name='ndicapi',
           'Operating System :: Microsoft :: Windows',
           'Operating System :: POSIX',
           'Operating System :: Unix',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.6',
-          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
+          'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
           'Programming Language :: C',
           'Programming Language :: Python :: Implementation :: CPython',
           'Topic :: Scientific/Engineering',

ndicapi-3.7.2/ndicapiExport.h.in

@@ -1,27 +0,0 @@
-/*=Plus=header=begin======================================================
-  Program: Plus
-  Copyright (c) Laboratory for Percutaneous Surgery. All rights reserved.
-  See License.txt for details.
-=========================================================Plus=header=end*/
-
-// .NAME __ndicapiExport - manage Windows system differences
-// .SECTION Description
-// The __ndicapiExport manages DLL export syntax differences
-// between different operating systems.
-
-#ifndef __ndicapiExport_h
-#define __ndicapiExport_h
-
-#cmakedefine ndicapi_STATIC
-
-#if defined(WIN32) && !defined(ndicapi_STATIC)
- #if defined(ndicapi_EXPORTS)
-  #define ndicapiExport __declspec( dllexport )
- #else
-  #define ndicapiExport __declspec( dllimport )
- #endif
-#else
- #define ndicapiExport
-#endif
-
-#endif