Build release version, separate UI into header file

src/yaw-tab/ui.cpp

@@ -1,5 +1,4 @@
-#include "DistrhoUI.hpp"
+#include "ui.h"
-#include "tablet.h"
 #ifdef DEBUG
 #include <format>
 #include <optional>
@@ -7,19 +6,13 @@
 
 START_NAMESPACE_DISTRHO
 
-//UI element for mapping the currently pressed pen button combination to a parameter.
+ButtonMappingWidget::ButtonMappingWidget(
-class ButtonMappingWidget : public NanoSubWidget,
+	Widget *parent,
-							public ButtonEventHandler
-{
-public:
-	ButtonMappingWidget(
-		Widget* parent,
 	float initialSize,
 	float initialX,
 	float initialY,
 	Parameters associatedParameter,
-		ButtonEventHandler::Callback* const callback) :
+	ButtonEventHandler::Callback *const callback) : x(initialX),
-		  x(initialX),
 													y(initialY),
 													size(initialSize),
 													param(associatedParameter),
@@ -28,14 +21,14 @@ public:
 													mask(0),
 													NanoSubWidget(parent),
 													ButtonEventHandler(this)
-	{
+{
 	setSize(Size<uint>(static_cast<uint>(size), static_cast<uint>(size)));
 	setAbsolutePos((int)x, (int)y);
 	ButtonEventHandler::setCallback(callback);
-	}
+}
 
-	void onNanoDisplay() override
+void ButtonMappingWidget::onNanoDisplay()
-	{
+{
 	beginPath();
 	strokeColor(200, 200, 200);
 	fillColor(0.5f, 0.5f, 0.5f, 0.5f * (isClicked + isPenPressed));
@@ -43,43 +36,23 @@ public:
 	stroke();
 	fill();
 	closePath();
-	}
+}
 
-	bool onMouse(const MouseEvent& ev) override
+bool ButtonMappingWidget::onMouse(const MouseEvent &ev)
-	{
+{
 	isClicked = ev.press;
 	return ButtonEventHandler::mouseEvent(ev);
-	}
+}
 
-	void setMask(const ButtonMask m) { mask = m; }
+static constexpr uint kInitialWidth = 800;
-	bool matchesMask(const ButtonMask m) { return isPenPressed = (m && mask == m); }
+static constexpr uint kInitialHeight = 600;
 
-	bool isClicked;
+TabUI::TabUI()
-	bool isPenPressed;
-
-private:
-	float x = 0;
-	float y = 0;
-	float size = 0;
-	const Parameters param;
-	ButtonMask mask;
-
-};
-
-
-class TabUI :	public UI,
-				public ButtonEventHandler::Callback
-{
-	static const uint kInitialWidth = 800;
-	static const uint kInitialHeight = 600;
-
-public:
-	TabUI()
 	: UI(kInitialWidth, kInitialHeight),
 	  tab(getWindow().getNativeWindowHandle()),
 	  AButtonWidget(this, 75.f, 700.f, 500.f, kParameterButtonA, this),
 	  BButtonWidget(this, 75.f, 700.f, 400.f, kParameterButtonB, this)
-	{
+{
 
 #ifdef DGL_NO_SHARED_RESOURCES
 	createFontFromFile("sans", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
@@ -87,75 +60,89 @@ public:
 	loadSharedResources();
 #endif
 
-		if (!tab.initialized) return;
+	if (!tab.initialized)
-		//setGeometryConstraints(400, static_cast<uint>(300 * tabletAspectRatio), true, false);
+		return;
-	}
+	// setGeometryConstraints(400, static_cast<uint>(300 * tabletAspectRatio), true, false);
+}
 
-protected:
+void TabUI::getTabletData()
-
+{
-	void getTabletData()
+	if (!tab.initialized || !tab.GetPacket(pkt))
-	{
+		return;
-		if (!tab.initialized || !tab.GetPacket(pkt)) return;
+	if (pkt == lastPkt)
-		if (pkt == lastPkt) return;
+		return;
-		if (pkt.x != lastPkt.x)				setParameterValue(ktpax, pkt.x);
+	if (pkt.x != lastPkt.x)
-		if (pkt.y != lastPkt.y)				setParameterValue(ktpay, pkt.y);
+		setParameterValue(ktpax, pkt.x);
-		if (pkt.z != lastPkt.z)				setParameterValue(ktpaz, pkt.z);
+	if (pkt.y != lastPkt.y)
-		if (pkt.p != lastPkt.p)				setParameterValue(ktpap, pkt.p);
+		setParameterValue(ktpay, pkt.y);
-		if (pkt.buttons != lastPkt.buttons) setButtonsValue(pkt.buttons);
+	if (pkt.z != lastPkt.z)
+		setParameterValue(ktpaz, pkt.z);
+	if (pkt.p != lastPkt.p)
+		setParameterValue(ktpap, pkt.p);
+	if (pkt.buttons != lastPkt.buttons)
+		setButtonsValue(pkt.buttons);
 	lastPkt = pkt;
-	}
+}
 
-	void setButtonsValue(unsigned long buttonMask)
+void TabUI::setButtonsValue(unsigned long buttonMask)
-	{
+{
 	if (AButtonWidget.matchesMask(buttonMask))
 		setParameterValue(kParameterButtonA, 1.f);
-		else	setParameterValue(kParameterButtonA, 0.f);
+	else
+		setParameterValue(kParameterButtonA, 0.f);
 
 	if (BButtonWidget.matchesMask(buttonMask))
 		setParameterValue(kParameterButtonB, 1.f);
-		else	setParameterValue(kParameterButtonB, 0.f);
+	else
+		setParameterValue(kParameterButtonB, 0.f);
+}
 
-	}
+void TabUI::buttonClicked(SubWidget *const widget, int)
+{
+	if (widget == &AButtonWidget)
+		AButtonWidget.setMask(pkt.buttons);
+	if (widget == &BButtonWidget)
+		BButtonWidget.setMask(pkt.buttons);
+}
 
-	void buttonClicked(SubWidget* const widget, int ) override
+void TabUI::parameterChanged(uint32_t index, float value)
+{
+
+	if (index != kParameterTime && index < kParameterCount)
 	{
-		if (widget == &AButtonWidget) AButtonWidget.setMask(pkt.buttons);
-		if (widget == &BButtonWidget) BButtonWidget.setMask(pkt.buttons);
-	}
-
-	void parameterChanged(uint32_t index, float value) override
-	{
-
-		if (index != kParameterTime && index < kParameterCount) {
 		switch (index)
 		{
-			case(ktpax): pkt.x = value;
+		case (ktpax):
-			case(ktpay): pkt.y = value;
+			pkt.x = value;
-			case(ktpaz): pkt.z = value;
+		case (ktpay):
-			case(ktpap): pkt.p = value;
+			pkt.y = value;
+		case (ktpaz):
+			pkt.z = value;
+		case (ktpap):
+			pkt.p = value;
 		}
 		return;
 	}
 
 	getTabletData();
 	repaint();
-	}
+}
 
-	void uiIdle() override
+void TabUI::uiIdle()
-	{
+{
 	getTabletData();
 	repaint();
-	}
+}
 
-	bool onMouse(const MouseEvent& ev) override
+bool TabUI::onMouse(const MouseEvent &ev)
-	{
+{
 	getTabletData();
 	repaint();
-		return false; //Allow event to propagate.
+	return false; // Allow event to propagate.
-	}
+}
 
-	bool onScroll(const ScrollEvent& ev) override
+bool TabUI::onScroll(const ScrollEvent &ev)
-	{
+{
 	double add;
 	const uint x = getWidth();
 	const uint y = getHeight();
@@ -163,19 +150,23 @@ protected:
 	add = (ev.delta.getY() > 0) ? 1 : -1;
 
 	float tabletAspectRatio;
-		if (tab.initialized) tabletAspectRatio = tab.ext.y / tab.ext.x; else tabletAspectRatio = 1.f;
+	if (tab.initialized)
+		tabletAspectRatio = tab.ext.y / tab.ext.x;
+	else
+		tabletAspectRatio = 1.f;
 	setSize(static_cast<uint>(x + add + 0.5), static_cast<uint>(tabletAspectRatio * (x + add + 0.5)));
 	return true;
-	}
+}
 
-
+void TabUI::onNanoDisplay()
-	void onNanoDisplay() override
+{
-	{
 	fontSize(15.0f);
 	textLineHeight(1.f);
 
-		//Report tablet errors.
+// Report tablet errors.
-		if (!tab.initialized) {
+#ifdef DEBUG
+	if (!tab.initialized)
+	{
 		const std::string err = std::vformat("Tablet not supported:\n{}",
 											 std::make_format_args(tab.errormsg));
 		beginPath();
@@ -185,19 +176,23 @@ protected:
 		return;
 	}
 
-		//Numerical feedback.
+	// Numerical feedback.
 	beginPath();
 	fillColor(200, 200, 200);
 	textBox(0.f, 15.f, 250.f,
 			std::format("x: {:.3f}\ny: {:.3f}\nz: {:.3f}\np: {:.3f}\nb: {}",
-				pkt.x, pkt.y, pkt.z, pkt.p, pkt.buttons).c_str(), nullptr);
+						pkt.x, pkt.y, pkt.z, pkt.p, pkt.buttons)
+				.c_str(),
+			nullptr);
 	closePath();
+#endif
 
-		//Pen position and pressure.
+	// Pen position and pressure.
 	drawCircle(pkt.x, pkt.y, pkt.z, pkt.p);
-	}
+}
 
-	void drawCircle(float x, float y, float z, float p) {
+void TabUI::drawCircle(float x, float y, float z, float p)
+{
 
 	static constexpr float circleRadius = 25.f;
 	x *= getWidth();
@@ -231,35 +226,11 @@ protected:
 	circle(x, y, z * circleRadius);
 	stroke();
 	closePath();
-	}
+}
 
-
+UI *createUI()
-	// -------------------------------------------------------------------------------------------------------
-
-private:
-
-	// Tablet context handler
-	Tablet tab;
-	Packet pkt = { 0 };
-	Packet lastPkt = { 0 };
-
-	// Button mapping widgets
-	ButtonMappingWidget AButtonWidget;
-	ButtonMappingWidget BButtonWidget;
-	
-
-	/**
-	   Set our UI class as non-copyable and add a leak detector just in case.
-	 */
-	DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TabUI)
-};
-
-
-
-UI* createUI()
 {
 	return new TabUI();
 }
 
-
 END_NAMESPACE_DISTRHO

src/yaw-tab/ui.h

@@ -0,0 +1,68 @@
+#include "DistrhoUI.hpp"
+#include "tablet.h"
+#ifdef DEBUG
+#include <format>
+#include <optional>
+#endif
+
+START_NAMESPACE_DISTRHO
+
+class ButtonMappingWidget : public NanoSubWidget,
+                            public ButtonEventHandler
+{
+public:
+    explicit ButtonMappingWidget(
+        Widget *parent,
+        float initialSize,
+        float initialX,
+        float initialY,
+        Parameters associatedParameter,
+        ButtonEventHandler::Callback *const callback);
+    void onNanoDisplay() override;
+    bool onMouse(const MouseEvent &ev) override;
+    void setMask(const ButtonMask m) { mask = m; };
+    bool matchesMask(const ButtonMask m) { return isPenPressed = (m && mask == m); };
+
+    bool isClicked;
+    bool isPenPressed;
+
+private:
+    float x = 0;
+    float y = 0;
+    float size = 0;
+    const Parameters param;
+    ButtonMask mask;
+};
+
+class TabUI : public UI,
+              public ButtonEventHandler::Callback
+{
+public:
+    explicit TabUI();
+
+    void buttonClicked(SubWidget *const widget, int) override;
+    void parameterChanged(uint32_t index, float value) override;
+
+    void uiIdle() override;
+    bool onMouse(const MouseEvent &ev) override;
+    bool onScroll(const ScrollEvent &ev) override;
+    void onNanoDisplay() override;
+
+private:
+    void getTabletData();
+    void setButtonsValue(unsigned long buttonMask);
+    void drawCircle(float x, float y, float z, float p);
+
+    // Tablet context handler
+    Tablet tab;
+    Packet pkt = {0};
+    Packet lastPkt = {0};
+
+    // Button mapping widgets
+    ButtonMappingWidget AButtonWidget;
+    ButtonMappingWidget BButtonWidget;
+
+    DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TabUI)
+};
+
+END_NAMESPACE_DISTRHO