Skip to content

Commit 9c8a3c5

Browse files
authored
Merge pull request #754 from bitcraze/rik/remove-opencv-geometry-estimator
Remove OpenCV-based lighthouse geometry estimator
2 parents 57ad1bf + b0062f4 commit 9c8a3c5

2 files changed

Lines changed: 0 additions & 19 deletions

File tree

src/cfclient/ui/dialogs/lighthouse_bs_geometry_dialog.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from PyQt6 import QtWidgets
3232
from PyQt6 import uic
3333
from PyQt6.QtCore import QVariant, Qt, QAbstractTableModel, pyqtSignal
34-
from cflib.localization import LighthouseBsGeoEstimator
3534
from cflib.localization import LighthouseSweepAngleAverageReader
3635
from cflib.crazyflie.mem import LighthouseBsGeometry
3736
from cfclient.ui.wizards.lighthouse_geo_bs_estimation_wizard import LighthouseBasestationGeometryWizard
@@ -138,13 +137,6 @@ def __init__(self, lighthouse_tab, *args):
138137
self._lighthouse_tab = lighthouse_tab
139138

140139
self._estimate_geometry_button.clicked.connect(self._estimate_geometry_button_clicked)
141-
self._simple_estimator = LighthouseBsGeoEstimator()
142-
self._estimate_geometry_simple_button.clicked.connect(self._estimate_geometry_simple_button_clicked)
143-
try:
144-
if not self._simple_estimator.is_available():
145-
self._estimate_geometry_simple_button.setEnabled(False)
146-
except Exception as e:
147-
print(e)
148140

149141
self._write_to_cf_button.clicked.connect(self._write_to_cf_button_clicked)
150142

@@ -205,10 +197,6 @@ def _estimate_geometry_button_clicked(self):
205197
self._base_station_geometry_wizard.show()
206198
self.hide()
207199

208-
def _estimate_geometry_simple_button_clicked(self):
209-
self._sweep_angle_reader.start_angle_collection()
210-
self._update_ui()
211-
212200
def _write_to_cf_button_clicked(self):
213201
if len(self._newly_estimated_geometry) > 0:
214202
self._lighthouse_tab.write_and_store_geometry(self._newly_estimated_geometry)

src/cfclient/ui/dialogs/lighthouse_bs_geometry_dialog.ui

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@
4141
</property>
4242
</spacer>
4343
</item>
44-
<item>
45-
<widget class="QPushButton" name="_estimate_geometry_simple_button">
46-
<property name="text">
47-
<string>Estimate Geometry Simple</string>
48-
</property>
49-
</widget>
50-
</item>
5144
</layout>
5245
</item>
5346
<item>

0 commit comments

Comments
 (0)