From 202d88d6be6e2c7bf00f6e76eed7770a55126b31 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 18 Apr 2019 15:31:07 +0200 Subject: [PATCH] experimental python --- python/sls_detector/experimental.py | 15 --------------- python/src/main.cpp | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/python/sls_detector/experimental.py b/python/sls_detector/experimental.py index cd815ad97..a7f54416e 100755 --- a/python/sls_detector/experimental.py +++ b/python/sls_detector/experimental.py @@ -6,19 +6,4 @@ class ExperimentalDetector(multiDetectorApi): super().__init__(0) self.online = True - @property - def online(self): - return self._setOnline() == 1 - - @online.setter - def online(self, value): - self._setOnline(value) - - @property - def rx_udpip(self): - return self._getReceiverUDPIP(-1) - - @rx_udpip.setter - def rx_udpip(self, ip): - self._setReceiverUDPIP(ip, -1) \ No newline at end of file diff --git a/python/src/main.cpp b/python/src/main.cpp index 4b67a1aa0..bc2aacc2d 100755 --- a/python/src/main.cpp +++ b/python/src/main.cpp @@ -183,8 +183,10 @@ PYBIND11_MODULE(_sls_detector, m) { .def("setRxDataStreamStatus", &Detector::setRxDataStreamStatus) // Network stuff - .def("getReceiverHostname", &Detector::getReceiverHostname) - .def("setReceiverHostname", &Detector::setReceiverHostname) + .def("getReceiverHostname", &Detector::getReceiverHostname, + py::arg("det_id") = -1) + .def("setReceiverHostname", &Detector::setReceiverHostname, + py::arg("hostname"), py::arg("det_id") = -1) .def("getReceiverStreamingPort", &Detector::getReceiverStreamingPort) .def("setReceiverStreamingPort", &Detector::setReceiverStreamingPort) .def("getReceiverUDPPort", &Detector::getReceiverUDPPort) @@ -289,9 +291,9 @@ PYBIND11_MODULE(_sls_detector, m) { .def("setPatternWaitTime", &Detector::setPatternWaitTime, py::arg("level"), py::arg("duration"), py::arg("det_id") = -1) - + .def("getPatternWaitTime", &Detector::getPatternWaitTime, - py::arg("level"), py::arg("det_id") = -1) + py::arg("level"), py::arg("det_id") = -1) .def("getImageSize", &Detector::getImageSize) .def("setImageSize", &Detector::setImageSize) @@ -303,8 +305,13 @@ PYBIND11_MODULE(_sls_detector, m) { py::class_ multiDetectorApi(m, "multiDetectorApi"); multiDetectorApi.def(py::init()) .def("acquire", &multiSlsDetector::acquire) - .def("_setOnline", &multiSlsDetector::setOnline, py::arg("flag") = -1, - py::arg("det_id") = -1) + + .def_property("online", + py::cpp_function(&multiSlsDetector::setOnline, py::arg(), py::arg()=-1, py::arg("det_id")=-1), + py::cpp_function(&multiSlsDetector::setOnline, py::arg(), py::arg("flag"), py::arg("det_id")=-1) + ) + // .def("_setOnline", &multiSlsDetector::setOnline, py::arg("flag") = -1, + // py::arg("det_id") = -1) .def_property_readonly( "hostname", py::cpp_function(&multiSlsDetector::getHostname, @@ -317,6 +324,11 @@ PYBIND11_MODULE(_sls_detector, m) { .def_property_readonly( "detectornumber", py::cpp_function(&multiSlsDetector::getDetectorNumber)) + .def_property("rx_udpip", + py::cpp_function(&multiSlsDetector::getReceiverUDPIP, + py::arg(), py::arg("det_id") = -1), + py::cpp_function(&multiSlsDetector::setReceiverUDPIP, + py::arg(), py::arg("ip"), py::arg("det_id") = -1) ) .def("_getReceiverUDPIP", &multiSlsDetector::getReceiverUDPIP) .def("_setReceiverUDPIP", &multiSlsDetector::setReceiverUDPIP) .def("getPatternLoops", &multiSlsDetector::getPatternLoops,