From e8e86fc142a131a92ca23435182c0a1f09fe2b52 Mon Sep 17 00:00:00 2001 From: Kristoffer Richardsson Date: Fri, 21 Jan 2022 09:52:08 +0100 Subject: [PATCH 1/3] Remove markers from arrowa in 3d visualizations --- src/cfclient/ui/tabs/lighthouse_tab.py | 9 ++++----- src/cfclient/ui/tabs/locopositioning_tab.py | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/cfclient/ui/tabs/lighthouse_tab.py b/src/cfclient/ui/tabs/lighthouse_tab.py index ac12486bd4..3ffad7cb61 100644 --- a/src/cfclient/ui/tabs/lighthouse_tab.py +++ b/src/cfclient/ui/tabs/lighthouse_tab.py @@ -199,7 +199,7 @@ def _addArrows(self, length, width, head_length, head_width, parent): [base_len, -hw, 0], [base_len, -w, 0], [0, -w, 0]], - width=1.0, color='red', parent=parent) + width=1.0, color='red', parent=parent, marker_size=0.0) # Y-axis scene.visuals.LinePlot([ @@ -210,7 +210,7 @@ def _addArrows(self, length, width, head_length, head_width, parent): [-hw, base_len, 0], [-w, base_len, 0], [-w, 0, 0]], - width=1.0, color='green', parent=parent) + width=1.0, color='green', parent=parent, marker_size=0.0) # Z-axis scene.visuals.LinePlot([ @@ -221,7 +221,7 @@ def _addArrows(self, length, width, head_length, head_width, parent): [0, -hw, base_len], [0, -w, base_len], [0, -w, 0]], - width=1.0, color='blue', parent=parent) + width=1.0, color='blue', parent=parent, marker_size=0.0) def update_cf_pose(self, position, rot): if not self._cf: @@ -305,8 +305,7 @@ def __init__(self, tabWidget, helper, *args): self._connected_signal.connect(self._connected) self._disconnected_signal.connect(self._disconnected) self._log_error_signal.connect(self._logging_error) - self._cb_param_to_detect_lighthouse_deck_signal.connect( - self._cb_param_to_detect_lighthouse_deck) + self._cb_param_to_detect_lighthouse_deck_signal.connect(self._cb_param_to_detect_lighthouse_deck) self._status_report_signal.connect(self._status_report_received) self._new_system_config_written_to_cf_signal.connect(self._new_system_config_written_to_cf) self._geometry_read_signal.connect(self._geometry_read_cb) diff --git a/src/cfclient/ui/tabs/locopositioning_tab.py b/src/cfclient/ui/tabs/locopositioning_tab.py index 31e783c06f..dde758b5e9 100644 --- a/src/cfclient/ui/tabs/locopositioning_tab.py +++ b/src/cfclient/ui/tabs/locopositioning_tab.py @@ -171,7 +171,7 @@ def addArrows(self, length, width, head_length, head_width, parent): [base_len, -hw, 0], [base_len, -w, 0], [0, -w, 0]], - width=1.0, color='red', parent=parent) + width=1.0, color='red', parent=parent, marker_size=0.0) # Y-axis scene.visuals.LinePlot([ @@ -182,7 +182,7 @@ def addArrows(self, length, width, head_length, head_width, parent): [-hw, base_len, 0], [-w, base_len, 0], [-w, 0, 0]], - width=1.0, color='green', parent=parent) + width=1.0, color='green', parent=parent, marker_size=0.0) # Z-axis scene.visuals.LinePlot([ @@ -193,7 +193,7 @@ def addArrows(self, length, width, head_length, head_width, parent): [0, -hw, base_len], [0, -w, base_len], [0, -w, 0]], - width=1.0, color='blue', parent=parent) + width=1.0, color='blue', parent=parent, marker_size=0.0) def update_data(self, anchors, pos, display_mode): self._cf.set_data(pos=np.array([pos]), face_color=self.POSITION_BRUSH) From cac5a940466123e5ea105c0ec10cedaaa2ba8715 Mon Sep 17 00:00:00 2001 From: Kristoffer Richardsson Date: Fri, 21 Jan 2022 10:32:20 +0100 Subject: [PATCH 2/3] Moved graph up in lighthouse tab --- src/cfclient/ui/tabs/lighthouse_tab.ui | 792 ++++++++++++------------- 1 file changed, 388 insertions(+), 404 deletions(-) diff --git a/src/cfclient/ui/tabs/lighthouse_tab.ui b/src/cfclient/ui/tabs/lighthouse_tab.ui index ccabd350ff..90057da83b 100644 --- a/src/cfclient/ui/tabs/lighthouse_tab.ui +++ b/src/cfclient/ui/tabs/lighthouse_tab.ui @@ -25,7 +25,7 @@ 6 - QLayout::SetMinimumSize + QLayout::SetDefaultConstraint @@ -33,476 +33,460 @@ QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Crazyflie status - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + + + 0 + 0 + + + + + 0 + 0 + + + + Crazyflie status + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + - - - QLayout::SetDefaultConstraint - + + + + + Status: + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + - + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Position: + + + + + + + + 150 + 0 + + + + QFrame::NoFrame + + + (0.0 , 0.0 , 0.0) + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Vertical + + + + 0 + 20 + + + + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + Basestation Status + + + + + + - + + + + - - - + + + QLayout::SetMinimumSize + + + 2 + + + + + background-color: lightpink; + + + QFrame::Box + - Status: + - - - - - 0 - 0 - + + + + background-color: lightpink; + + + QFrame::Box + + + + + + + + + + background-color: lightpink; + + + QFrame::Box + + + + + + + + + background-color: lightpink; + + + QFrame::Box + + + + + + + + - 200 + 100 0 - - + Geometry + + + + + + + background-color: lightpink; + + + QFrame::Box - - true + + - - - - Qt::Horizontal + + + + background-color: lightpink; - + + QFrame::Box + + + + + + + + + - 40 - 20 + 100 + 0 - + + Estimator + + - - - - - - + + - Position: + 2 - - + + + + background-color: lightpink; + + + QFrame::Box + + + + + + + + + + background-color: lightpink; + + + QFrame::Box + + + + + + + + - 150 + 100 0 - - QFrame::NoFrame + + Calibration + + + + - (0.0 , 0.0 , 0.0) + 1 - - + + + + + 40 + 0 + + + + BS + + + + + + + + 100 + 0 + + + + Receiving + + + + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 0 - - - - Qt::Vertical - - - - 20 - 10 - - - - - - - + + + - - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - Basestation Status - - + + + + 0 + 0 + + + + + 0 + 0 + + + + System Management + + + + QLayout::SetDefaultConstraint + + + - + - - - - - - - - - - QLayout::SetMinimumSize - - - 2 - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - - 100 - 0 - - - - Geometry - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - - 100 - 0 - - - - Estimator - - - - - - - 2 - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - background-color: lightpink; - - - QFrame::Box - - - - - - - - - - - 100 - 0 - - - - Calibration - - - - - - - 1 - - - - - - - - 40 - 0 - - - - BS - - - - - - - - 100 - 0 - - - - Receiving - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - + + + Manage geometry + + - - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - System Management - - - - - - - - - Manage geometry - - - - - - - Change system type - - - - - - - Set BS channel - - - - + + + Change system type + + - - - - - Save system config - - - - - - - Load system config - - - - + + + Set BS channel + + + + + + - - - Qt::Vertical + + + Save system config - - - 20 - 0 - + + + + + + Load system config - + + + + + Qt::Vertical + + + + 20 + 5 + + + + - - - + + + @@ -524,7 +508,7 @@ - QLayout::SetDefaultConstraint + QLayout::SetMaximumSize From 09627bc3f8b9c560a873b79318cb353fcab4386d Mon Sep 17 00:00:00 2001 From: Kristoffer Richardsson Date: Mon, 24 Jan 2022 11:00:51 +0100 Subject: [PATCH 3/3] Bumped minimum required numpy version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f9c11d1c9d..cac86f9042 100644 --- a/setup.py +++ b/setup.py @@ -130,7 +130,7 @@ def relative(lst, base=''): 'PyYAML~=5.3', 'asyncqt~=0.8.0', 'qtm~=2.0.2', - 'numpy>=1.19.2,<1.24', + 'numpy>=1.20,<1.25', 'vispy~=0.9.0', 'pyserial~=3.5', 'pyqt5~=5.15.0'],