ui: add Plate class

fbbdev · fbbdev · commit 05fc46b49abf · 2017-09-06T12:46:56.000+02:00
diff --git a/blocks/constellation.cpp b/blocks/constellation.cpp
@@ -141,17 +141,16 @@ int main(int argc, char* argv[]) {
         } },
     });
 
+    ui::Plate plate;
+
     while (!wnd->closed()) {
         buffer_lock.lock();
         std::copy(buf.begin(), buf.end(), local_buf.begin());
         buffer_lock.unlock();
 
         auto focused = wnd->focused();
 
-        wnd->update(nk_rgb_f(0.05, 0.07, 0.05), [&local_buf,&v=view,&grid,mouse,focused](NVGcontext* vg, int width, int height) {
-            std::ostringstream fmt;
-            fmt << std::defaultfloat;
-
+        wnd->update(nk_rgb_f(0.05, 0.07, 0.05), [&local_buf,&v=view,&grid,&plate,mouse,focused](NVGcontext* vg, int width, int height) {
             bool showCursor = focused && (mouse.x > 0 && mouse.x < width)
                                       && (mouse.y > 0 && mouse.y < height);
 
@@ -160,6 +159,8 @@ int main(int argc, char* argv[]) {
             grid.draw(vg, view);
 
             // draw constellation
+            nvgSave(vg);
+
             view.apply(vg);
 
             nvgFillColor(vg, nvgRGB(80, 208, 80));
@@ -170,10 +171,10 @@ int main(int argc, char* argv[]) {
             }
             nvgFill(vg);
 
+            nvgRestore(vg);
+
             // draw cursor
             if (showCursor) {
-                nvgResetTransform(vg);
-
                 nvgStrokeColor(vg, nvgRGBf(1.0f, 1.0f, 1.0f));
 
                 nvgBeginPath(vg);
@@ -191,33 +192,15 @@ int main(int argc, char* argv[]) {
 
                 std::string label = ui::format(coord.x, pixel_mag.x) +
                                     ((coord.y < 0) ? "-" : "+") + "j" +
-                                    ui::format(coord.y, pixel_mag.y);
+                                    ui::format(std::abs(coord.y), pixel_mag.y);
 
                 bool left   = (width - mouse.x < 100),
                      bottom = (mouse.y < 50);
 
-                nvgTextAlign(vg, (left ? NVG_ALIGN_RIGHT : NVG_ALIGN_LEFT) |
-                                 (bottom ? NVG_ALIGN_TOP : NVG_ALIGN_BOTTOM));
-
-                float bounds[4];
-                nvgTextBounds(vg,
-                    mouse.x + (left ? -10 : 10), mouse.y + (bottom ? 10 : -10),
-                    label.c_str(), nullptr, bounds);
-                float label_width = bounds[2] - bounds[0];
-                float label_height = bounds[3] - bounds[1];
+                int align = (left ? NVG_ALIGN_RIGHT : NVG_ALIGN_LEFT) |
+                            (bottom ? NVG_ALIGN_TOP : NVG_ALIGN_BOTTOM);
 
-                // Text background, for readability
-                nvgFillColor(vg, nvgRGBAf(0.0f, 0.0f, 0.0f, 0.5f));
-                nvgBeginPath(vg);
-                nvgRoundedRect(vg,
-                    mouse.x + (left ? -15-label_width : 5), mouse.y + (bottom ? 5 : -15 - label_height),
-                    label_width + 10, label_height + 10, 3);
-                nvgFill(vg);
-
-                nvgFillColor(vg, nvgRGBf(1.0f, 1.0f, 1.0f));
-                nvgText(vg,
-                    mouse.x + (left ? -10 : 10), mouse.y + (bottom ? 10 : -10),
-                    label.c_str(), nullptr);
+                plate.draw(vg, label, align, mouse);
             }
         }, [&view,&mouse](nk_context* ctx, int width, int height) {
             view.zoom(ctx->input.mouse.scroll_delta.y);
diff --git a/include/sdr/ui/plate.hpp b/include/sdr/ui/plate.hpp
@@ -0,0 +1,101 @@
+/**
+ * sdr - software-defined radio building blocks for unix pipes
+ * Copyright (C) 2017 Fabio Massaioli
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "string_view.hpp"
+#include "view.hpp"
+
+namespace sdr { namespace ui
+{
+
+struct PlateStyle {
+    float padding = 5.0f;
+    float margin = 5.0f;
+    NVGcolor fg = nvgRGBf(1.0f, 1.0f, 1.0f);
+    NVGcolor bg = nvgRGBAf(0.0f, 0.0f, 0.0f, 0.5f);
+    float radius = 3.0f;
+};
+
+class Plate {
+public:
+    Plate(int a = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, Vec2 p = { 0.0f, 0.0f })
+        : align(a), pos(p)
+        {}
+
+    Plate(PlateStyle s,
+          int a = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, Vec2 p = { 0.0f, 0.0f })
+        : style(s), align(a), pos(p)
+        {}
+
+    Plate(StringView l,
+          int a = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, Vec2 p = { 0.0f, 0.0f })
+        : label(l.to_string()), align(a), pos(p)
+        {}
+
+    Plate(StringView l, PlateStyle s,
+          int a = NVG_ALIGN_LEFT | NVG_ALIGN_TOP, Vec2 p = { 0.0f, 0.0f })
+        : label(l.to_string()), style(s), align(a), pos(p)
+        {}
+
+    // Use default values
+    void draw(NVGcontext* vg) const {
+        draw(vg, label, align, pos);
+    }
+
+    // Change position
+    void draw(NVGcontext* vg, Vec2 p) const {
+        draw(vg, label, align, p);
+    }
+
+    // Change alignment
+    void draw(NVGcontext* vg, int a) const {
+        draw(vg, label, a, pos);
+    }
+
+    // Change alignment and position
+    void draw(NVGcontext* vg, int a, Vec2 p) const {
+        draw(vg, label, a, p);
+    }
+
+    // Change label
+    void draw(NVGcontext* vg, StringView l) const {
+        draw(vg, l, align, pos);
+    }
+
+    // Change label and position
+    void draw(NVGcontext* vg, StringView l, Vec2 p) const {
+        draw(vg, l, align, p);
+    }
+
+    // Change label and alignment
+    void draw(NVGcontext* vg, StringView l, int a) const {
+        draw(vg, l, a, pos);
+    }
+
+    // Draw plate
+    void draw(NVGcontext* vg, StringView l, int a, Vec2 p) const;
+
+private:
+    std::string label;
+    PlateStyle style;
+    int align;
+    Vec2 pos;
+};
+
+} /* namespace ui */ } /* namespace sdr */
diff --git a/include/sdr/ui/string_view.hpp b/include/sdr/ui/string_view.hpp
@@ -0,0 +1,28 @@
+/**
+ * sdr - software-defined radio building blocks for unix pipes
+ * Copyright (C) 2017 Fabio Massaioli
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <experimental/string_view>
+
+namespace sdr { namespace ui
+{
+
+using StringView = std::experimental::string_view;
+
+} /* namespace ui */ } /* namespace sdr */
diff --git a/include/sdr/ui/ui.hpp b/include/sdr/ui/ui.hpp
@@ -20,5 +20,7 @@
 
 #include "format.hpp"
 #include "grid.hpp"
+#include "plate.hpp"
+#include "string_view.hpp"
 #include "view.hpp"
 #include "window.hpp"
diff --git a/lib/ui/meson.build b/lib/ui/meson.build
@@ -17,6 +17,7 @@
 ui_library = shared_library('sdr-ui',
     'ui.cpp',
     'grid.cpp',
+    'plate.cpp',
     dependencies: [
         font_res,
         glad_lib,
diff --git a/lib/ui/plate.cpp b/lib/ui/plate.cpp
@@ -0,0 +1,66 @@
+/**
+ * sdr - software-defined radio building blocks for unix pipes
+ * Copyright (C) 2017 Fabio Massaioli
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "align.hpp"
+#include "plate.hpp"
+
+using namespace sdr::ui;
+
+void Plate::draw(NVGcontext* vg, StringView l, int a, Vec2 p) const {
+    nvgSave(vg);
+
+    auto halign = detail::halign(a),
+         valign = detail::valign(a);
+
+    // Baseline alignment is not supported
+    if (valign & NVG_ALIGN_BASELINE)
+        valign = NVG_ALIGN_BOTTOM;
+
+    float label_x =
+        (halign & NVG_ALIGN_LEFT) ? p.x + style.margin + style.padding :
+            (halign & NVG_ALIGN_RIGHT) ? p.x - style.margin - style.padding : p.x;
+    float label_y =
+        (valign & NVG_ALIGN_TOP) ? p.y + style.margin + style.padding :
+            (valign & NVG_ALIGN_BOTTOM) ? p.y - style.margin - style.padding : p.y;
+
+    float bounds[4];
+    nvgTextBounds(vg, label_x, label_y, l.begin(), l.end(), bounds);
+    float label_width = std::abs(bounds[2] - bounds[0]);
+    float label_height = std::abs(bounds[3] - bounds[1]);
+
+    float plate_width = label_width + 2*style.padding;
+    float plate_height = label_height + 2*style.padding;
+
+    float plate_x =
+        (halign & NVG_ALIGN_LEFT) ? p.x + style.margin :
+            (halign & NVG_ALIGN_RIGHT) ? p.x - style.margin - plate_width : p.x - (plate_width/2);
+    float plate_y =
+        (valign & NVG_ALIGN_TOP) ? p.y + style.margin :
+            (valign & NVG_ALIGN_BOTTOM) ? p.y - style.margin - plate_height : p.y - (plate_height/2);
+
+    nvgFillColor(vg, style.bg);
+    nvgBeginPath(vg);
+    nvgRoundedRect(vg, plate_x, plate_y, plate_width, plate_height, style.radius);
+    nvgFill(vg);
+
+    nvgFillColor(vg, style.fg);
+    nvgTextAlign(vg, halign | valign);
+    nvgText(vg, label_x, label_y, l.begin(), l.end());
+
+    nvgRestore(vg);
+}
diff --git a/lib/ui/ui_test.cpp b/lib/ui/ui_test.cpp
@@ -23,7 +23,6 @@
 #include <algorithm>
 #include <iostream>
 #include <limits>
-#include <sstream>
 
 using namespace sdr;
 
@@ -38,23 +37,21 @@ int main() {
     int avgCount = 5;
     float scale = 50.0f;
 
-    std::ostringstream formatter;
-
     std::string fps = "FPS: 0";
     std::size_t frames = 0;
     double lastTime = 0;
 
     bool mpressed = false;
     bool prevShowLine = false;
 
+    ui::Plate plate;
+
     while (!wnd->closed()) {
         auto time = glfwGetTime();
         ++frames;
 
         if (time - lastTime >= 0.5) {
-            formatter.str("");
-            formatter << "FPS: " << frames * 2;
-            fps = formatter.str();
+            fps = "FPS: " + ui::format(frames * 2);
             frames = 0;
             lastTime += 0.5;
         }
@@ -67,7 +64,7 @@ int main() {
                          my > 0 && my < wSize.second &&
                          wnd->focused());
 
-        wnd->update([&formatter,avgCount,scale,fps,mx,my,showLine](NVGcontext* vg, int width, int height) {
+        wnd->update([avgCount,scale,fps,&plate,mx,my,showLine](NVGcontext* vg, int width, int height) {
             nvgFillColor(vg, nvgRGBf(1.0f, 1.0f, 1.0f));
             nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_TOP);
             nvgText(vg, 10, 10, fps.c_str(), NULL);
@@ -84,12 +81,9 @@ int main() {
                 nvgLineTo(vg, mx, height);
                 nvgStroke(vg);
 
-                formatter.str("");
-                formatter << mx;
-
-                nvgFillColor(vg, nvgRGBf(1.0f, 1.0f, 1.0f));
-                nvgTextAlign(vg, ((width - mx < 100) ? NVG_ALIGN_RIGHT : NVG_ALIGN_LEFT) | NVG_ALIGN_MIDDLE);
-                nvgText(vg, mx + ((width - mx < 100) ? -10 : 10), my, formatter.str().c_str(), NULL);
+                plate.draw(vg, ui::format(mx),
+                           ((width - mx < 100) ? NVG_ALIGN_RIGHT : NVG_ALIGN_LEFT) | NVG_ALIGN_MIDDLE,
+                           { float(mx), float(my) });
             }
         }, [&avgCount,&scale,mx,prevShowLine,showLine,&mpressed](nk_context* ctx, int width, int height) {
             if (prevShowLine && showLine) {
