Merge pull request hongquanli#3 from catalli/rtp-segmentation-async

Merging async RTP into latest rtp updates
sohamazing · Oct 7, 2023 · 0129124 · 0129124
2 parents 91e0c21 + 279728c
commit 0129124
Show file tree

Hide file tree

Showing 135 changed files with 33,636 additions and 35 deletions.
diff --git a/software/README.md b/software/README.md
@@ -9,11 +9,11 @@ sudo apt-get install python3-pyqtgraph
 sudo apt-get install python3-pyqt5
 sudo apt-get install git
 git clone https://github.com/hongquanli/octopi-research.git
-pip3 install qtpy pyserial pandas imageio crc==1.3.0
+pip3 install qtpy pyserial pandas imageio pyqt5-tools pyqtgraph scipy tensorrt crc==1.3.0
 python3 -m pip install --upgrade --user setuptools==58.3.0
 pip3 install opencv-python opencv-contrib-python
 pip3 install lxml
-pip3 install numpy==1.21
+pip3 install numpy
 ```
 
 ### install camera drivers

diff --git a/software/add_desktop_launcher_malaria.sh b/software/add_desktop_launcher_malaria.sh
diff --git a/software/configurations/configuration_octopi_v2.txt b/software/configurations/configuration_octopi_v2.txt
diff --git a/software/configurations/configuration_squid_6060.txt b/software/configurations/configuration_squid_6060.txt
diff --git a/...control/multipoint_custom_script_entry.py → ...ontrol/_multipoint_custom_script_entry.py b/...control/multipoint_custom_script_entry.py → ...ontrol/_multipoint_custom_script_entry.py
diff --git a/software/control/core.py b/software/control/core.py
diff --git a/software/control/gui_malaria.py b/software/control/gui_malaria.py
@@ -144,6 +144,7 @@ def __init__(self, is_simulation = False, *args, **kwargs):
 		self.dacControlWidget = widgets.DACControWidget(self.microcontroller)
 		self.autofocusWidget = widgets.AutoFocusWidget(self.autofocusController)
 		self.recordingControlWidget = widgets.RecordingWidget(self.streamHandler,self.imageSaver)
+		self.statsDisplayWidget = widgets.StatsDisplayWidget()
 		if ENABLE_TRACKING:
 			self.trackingControlWidget = widgets.TrackingControllerWidget(self.trackingController,self.configurationManager,show_configurations=TRACKING_SHOW_MICROSCOPE_CONFIGURATIONS)
 		self.multiPointWidget = widgets.MultiPointWidget(self.multipointController,self.configurationManager)
@@ -153,6 +154,7 @@ def __init__(self, is_simulation = False, *args, **kwargs):
 			self.recordTabWidget.addTab(self.trackingControlWidget, "Tracking")
 		#self.recordTabWidget.addTab(self.recordingControlWidget, "Simple Recording")
 		self.recordTabWidget.addTab(self.multiPointWidget, "Multipoint Acquisition")
+		self.recordTabWidget.addTab(self.statsDisplayWidget, "Detection Stats")
 
 		# layout widgets
 		layout = QVBoxLayout() #layout = QStackedLayout()
@@ -219,6 +221,10 @@ def __init__(self, is_simulation = False, *args, **kwargs):
 			self.navigationController.signal_joystick_button_pressed.connect(self.autofocusController.autofocus)
 		self.autofocusController.image_to_display.connect(self.imageDisplayWindow.display_image)
 		self.multipointController.image_to_display.connect(self.imageDisplayWindow.display_image)
+		try:
+			self.multipointController.detection_stats.connect(self.statsDisplayWidget.display_stats)
+		except:
+			pass
 		self.multipointController.signal_current_configuration.connect(self.liveControlWidget.set_microscope_mode)
 		self.multipointController.image_to_display_multi.connect(self.imageArrayDisplayWindow.display_image)
 
@@ -253,7 +259,6 @@ def __init__(self, is_simulation = False, *args, **kwargs):
 		self.gallery_umap_selection = GalleryViewWidget(NUM_ROWS,num_cols,self.dataHandler_umap_selection,dataHandler2=self.dataHandler)
 		self.gallerySettings = GalleryViewSettingsWidget()
 		self.trainingAndVisualizationWidget = TrainingAndVisualizationWidget(self.dataHandler)
-
 		'''
 		self.plots = {}
 		self.plots['Labels'] = PiePlotWidget()