Simplify BNO055 interface

- Correct tooltip information

Author: bparks13

Source/OnixSource.cpp

@@ -137,7 +137,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	static const String probeLetters = "ABCDEFGHI";
 	const int bufferSizeInSeconds = 10;
 	int npxProbeIdx = 0;
-	int bnoIdx = 0;
 
 	for (size_t dev_idx = 0; dev_idx < num_devs; dev_idx++)
 	{
@@ -175,7 +174,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 		}
 		else if (devices[dev_idx].id == ONIX_BNO055)
 		{
-			auto bno = std::make_unique<Bno055>("BNO-" + String::charToString(probeLetters[bnoIdx]), devices[dev_idx].idx, ctx);
+			auto bno = std::make_unique<Bno055>("BNO055", devices[dev_idx].idx, ctx);
 
 			int result = bno->enableDevice();
 
@@ -188,8 +187,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			bno->addSourceBuffers(sourceBuffers);
 
 			sources.add(bno.release());
-
-			bnoIdx++;
 		}
 		else if (devices[dev_idx].id == ONIX_DS90UB9RAW)
 		{

Source/UI/Bno055Interface.cpp

@@ -23,45 +23,26 @@
 
 #include "Bno055Interface.h"
 
-Bno055Interface::Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c, String headstageName_) :
+Bno055Interface::Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c) :
 	SettingsInterface(d, e, c),
 	device((Bno055*)d)
 {
 	if (device != nullptr)
 	{
-		nameLabel = std::make_unique<Label>("MAIN", "NAME");
-		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(625, 40, 370, 45);
-		addAndMakeVisible(nameLabel.get());
-
 		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
 		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
 		deviceEnableButton->setRadius(3.0f);
-		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setBounds(35, 35, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
-		deviceEnableButton->setTooltip("If disabled, probe will not stream data during acquisition");
+		deviceEnableButton->setTooltip("If disabled, BNO055 device will not stream data during acquisition");
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
-
-		infoLabel = std::make_unique<Label>("INFO", "INFO");
-		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
-		infoLabel->setJustificationType(Justification::topLeft);
-		addAndMakeVisible(infoLabel.get());
-
-		updateInfoString();
 	}
 
-	headstageName = headstageName_;
-
 	type = SettingsInterface::Type::BNO055_SETTINGS_INTERFACE;
 }
 
-Bno055Interface::~Bno055Interface()
-{
-}
-
 void Bno055Interface::buttonClicked(Button* button)
 {
 	if (button == deviceEnableButton.get())
@@ -98,21 +79,3 @@ void Bno055Interface::saveParameters(XmlElement* xml)
 void Bno055Interface::loadParameters(XmlElement* xml)
 {
 }
-
-void Bno055Interface::updateInfoString()
-{
-	String nameString, infoString;
-
-	if (headstageName != "")
-		nameString = "Headstage: " + headstageName;
-
-	if (device != nullptr)
-	{
-		infoString = "Device: BNO055";
-		infoString += "\n";
-		infoString += "\n";
-	}
-
-	infoLabel->setText(infoString, dontSendNotification);
-	nameLabel->setText(nameString, dontSendNotification);
-}

Source/UI/Bno055Interface.h

@@ -36,10 +36,7 @@ class Bno055Interface : public SettingsInterface,
 {
 public:
 	/** Constructor */
-	Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c, String headstageName = "");
-
-	/** Destructor */
-	~Bno055Interface();
+	Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
 	/** Disables buttons and starts animation if necessary */
 	void startAcquisition() override;
@@ -54,21 +51,16 @@ class Bno055Interface : public SettingsInterface,
 	void loadParameters(XmlElement* xml) override;
 
 	/** Updates the info string on the right-hand side of the component */
-	void updateInfoString() override;
+	void updateInfoString() override {};
 
 	/** Listener methods*/
 	void buttonClicked(Button*) override;
 
-	Bno055* device;
-
 private:
 
-	std::unique_ptr<Label> nameLabel;
-	std::unique_ptr<Label> infoLabel;
+	Bno055* device;
 
 	std::unique_ptr<UtilityButton> deviceEnableButton;
-
-	String headstageName;
 };
 
 #endif // !__BNO055INTERFACE_H__

Source/UI/NeuropixV1Interface.cpp

@@ -601,29 +601,29 @@ void NeuropixV1Interface::buttonClicked(Button* button)
 	{
 		mode = VisualizationMode::ENABLE_VIEW;
 		probeBrowser->stopTimer();
-		repaint();
 		drawLegend();
+		repaint();
 	}
 	else if (button == apGainViewButton.get())
 	{
 		mode = VisualizationMode::AP_GAIN_VIEW;
 		probeBrowser->stopTimer();
-		repaint();
 		drawLegend();
+		repaint();
 	}
 	else if (button == lfpGainViewButton.get())
 	{
 		mode = VisualizationMode::LFP_GAIN_VIEW;
 		probeBrowser->stopTimer();
-		repaint();
 		drawLegend();
+		repaint();
 	}
 	else if (button == referenceViewButton.get())
 	{
 		mode = VisualizationMode::REFERENCE_VIEW;
 		probeBrowser->stopTimer();
-		repaint();
 		drawLegend();
+		repaint();
 	}
 	else if (button == activityViewButton.get())
 	{
@@ -632,8 +632,8 @@ void NeuropixV1Interface::buttonClicked(Button* button)
 		if (acquisitionIsActive)
 			probeBrowser->startTimer(100);
 
-		repaint();
 		drawLegend();
+		repaint();
 	}
 	else if (button == enableButton.get())
 	{
@@ -868,8 +868,8 @@ bool NeuropixV1Interface::applyProbeSettings(ProbeSettings p, bool shouldUpdateP
 		CoreServices::saveRecoveryConfig();
 	}
 
-	repaint();
 	drawLegend();
+	repaint();
 
 	return true;
 }