summaryrefslogtreecommitdiff
path: root/plugingui
diff options
context:
space:
mode:
Diffstat (limited to 'plugingui')
-rw-r--r--plugingui/drumkittab.cc136
-rw-r--r--plugingui/drumkittab.h8
-rw-r--r--plugingui/image.cc5
-rw-r--r--plugingui/mainwindow.cc2
-rw-r--r--plugingui/resource.cc10
5 files changed, 121 insertions, 40 deletions
diff --git a/plugingui/drumkittab.cc b/plugingui/drumkittab.cc
index 6f5cd54..d6475fa 100644
--- a/plugingui/drumkittab.cc
+++ b/plugingui/drumkittab.cc
@@ -34,35 +34,41 @@
#include "painter.h"
#include "settings.h"
+#include <dgxmlparser.h>
+#include <path.h>
+
namespace GUI
{
DrumkitTab::DrumkitTab(Widget* parent,
- Settings& settings/*,
- SettingsNotifier& settings_notifier,
+ Settings& settings,
+ SettingsNotifier& settings_notifier/*,
Config& config*/)
: Widget(parent)
, settings(settings)
- /*, settings_notifier(settings_notifier)
- , config(config)*/
+ , settings_notifier(settings_notifier)
+ /*, config(config)*/
{
- init("/home/chaot/Programming/drumgizmo/crocellkit01.png", "/home/chaot/Programming/drumgizmo/crocellkit01_map.png");
-
velocity_label.move(10, height()-velocity_label.height()-5);
updateVelocityLabel();
velocity_label.resizeToText();
- instrument_name_label.move(velocity_label.width()+30, height()-instrument_name_label.height()-5);
+ instrument_name_label.move(velocity_label.width()+30,
+ height()-instrument_name_label.height()-5);
updateInstrumentLabel(-1);
pos_to_colour_index.setDefaultValue(-1);
+
+ CONNECT(this, settings_notifier.drumkit_file,
+ this, &DrumkitTab::drumkitFileChanged);
}
void DrumkitTab::resize(std::size_t width, std::size_t height)
{
Widget::resize(width, height);
- if (drumkit_image) {
+ if(drumkit_image)
+ {
Painter painter(*this);
painter.clear();
@@ -72,21 +78,27 @@ void DrumkitTab::resize(std::size_t width, std::size_t height)
}
velocity_label.move(10, height-velocity_label.height()-5);
- instrument_name_label.move(velocity_label.width()+30, height-instrument_name_label.height()-5);
+ instrument_name_label.move(velocity_label.width()+30,
+ height-instrument_name_label.height()-5);
}
void DrumkitTab::buttonEvent(ButtonEvent* buttonEvent)
{
- if (map_image) {
- if (buttonEvent->button == MouseButton::right) {
- if (buttonEvent->direction == GUI::Direction::down) {
+ if(map_image)
+ {
+ if(buttonEvent->button == MouseButton::right)
+ {
+ if(buttonEvent->direction == GUI::Direction::down)
+ {
Painter painter(*this);
painter.drawImage(drumkit_image_x, drumkit_image_y, *map_image);
shows_overlay = true;
redraw();
return;
}
- if (buttonEvent->direction == GUI::Direction::up) {
+
+ if(buttonEvent->direction == GUI::Direction::up)
+ {
Painter painter(*this);
painter.clear();
painter.drawImage(drumkit_image_x, drumkit_image_y, *drumkit_image);
@@ -100,21 +112,24 @@ void DrumkitTab::buttonEvent(ButtonEvent* buttonEvent)
}
}
- if (buttonEvent->button == MouseButton::left)
+ if(buttonEvent->button == MouseButton::left)
{
- if (buttonEvent->direction == GUI::Direction::down)
+ if(buttonEvent->direction == GUI::Direction::down)
{
triggerAudition(buttonEvent->x, buttonEvent->y);
highlightInstrument(current_index);
redraw();
}
- if (buttonEvent->direction == GUI::Direction::up)
+
+ if(buttonEvent->direction == GUI::Direction::up)
{
- if (shows_instrument_overlay) {
+ if(shows_instrument_overlay)
+ {
Painter painter(*this);
painter.clear();
painter.drawImage(drumkit_image_x, drumkit_image_y, *drumkit_image);
- if (shows_overlay) {
+ if(shows_overlay)
+ {
painter.drawImage(drumkit_image_x, drumkit_image_y, *map_image);
}
highlightInstrument(current_index);
@@ -143,13 +158,14 @@ void DrumkitTab::mouseMoveEvent(MouseMoveEvent* mouseMoveEvent)
auto index = pos_to_colour_index(x, y);
- if (index == current_index) { return; }
+ if(index == current_index) { return; }
current_index = index;
Painter painter(*this);
painter.clear();
painter.drawImage(drumkit_image_x, drumkit_image_y, *drumkit_image);
- if (shows_overlay) {
+ if(shows_overlay)
+ {
painter.drawImage(drumkit_image_x, drumkit_image_y, *map_image);
}
@@ -160,7 +176,8 @@ void DrumkitTab::mouseMoveEvent(MouseMoveEvent* mouseMoveEvent)
void DrumkitTab::mouseLeaveEvent()
{
- if (map_image && (shows_overlay || shows_instrument_overlay)) {
+ if(map_image && (shows_overlay || shows_instrument_overlay))
+ {
Painter painter(*this);
painter.clear();
painter.drawImage(drumkit_image_x, drumkit_image_y, *drumkit_image);
@@ -177,10 +194,14 @@ void DrumkitTab::triggerAudition(int x, int y)
y -= drumkit_image_y;
auto index = pos_to_colour_index(x, y);
- if (index == -1) { return; }
+ if(index == -1)
+ {
+ return;
+ }
auto const& instrument = to_instrument_name[index];
- if (!instrument.empty()) {
+ if(!instrument.empty())
+ {
++settings.audition_counter;
settings.audition_instrument = instrument;
settings.audition_velocity = current_velocity;
@@ -189,14 +210,18 @@ void DrumkitTab::triggerAudition(int x, int y)
void DrumkitTab::highlightInstrument(int index)
{
- if (index != -1) {
+ if(index != -1)
+ {
Painter painter(*this);
auto const& colour = colours[index];
+ //Colour colour(1.0f, 1.0f, 0.0f);
auto const& positions = colour_index_to_positions[index];
- painter.draw(positions.begin(), positions.end(), drumkit_image_x, drumkit_image_y, colour);
+ painter.draw(positions.begin(), positions.end(),
+ drumkit_image_x, drumkit_image_y, colour);
shows_instrument_overlay = true;
}
- else {
+ else
+ {
shows_instrument_overlay = false;
}
}
@@ -215,7 +240,8 @@ void DrumkitTab::updateInstrumentLabel(int index)
instrument_name_label.resizeToText();
}
-void DrumkitTab::init(std::string const& image_file, std::string const& map_file)
+void DrumkitTab::init(std::string const& image_file,
+ std::string const& map_file)
{
drumkit_image = std::make_unique<Image>(image_file);
map_image = std::make_unique<Image>(map_file);
@@ -229,18 +255,21 @@ void DrumkitTab::init(std::string const& image_file, std::string const& map_file
colour_index_to_positions.clear();
to_instrument_name.clear();
- for (std::size_t y = 0; y < map_image->height(); ++y)
+ for(std::size_t y = 0; y < map_image->height(); ++y)
{
- for (std::size_t x = 0; x < map_image->width(); ++x)
+ for(std::size_t x = 0; x < map_image->width(); ++x)
{
auto colour = map_image->getPixel(x, y);
- if (colour.alpha() == 0.) { continue; }
+ if(colour.alpha() == 0.)
+ {
+ continue;
+ }
auto it = std::find(colours.begin(), colours.end(), colour);
int index = std::distance(colours.begin(), it);
- if (it == colours.end())
+ if(it == colours.end())
{
// XXX: avoids low alpha values due to feathering of edges
colours.emplace_back(colour.red(), colour.green(), colour.blue(), 0.7);
@@ -254,15 +283,54 @@ void DrumkitTab::init(std::string const& image_file, std::string const& map_file
// set instrument names
to_instrument_name.resize(colours.size());
- for (std::size_t i = 0; i < colours.size(); ++i)
+ for(std::size_t i = 0; i < colours.size(); ++i)
{
- for (auto const& pair: colour_instrument_pairs)
+ for(auto const& pair: colour_instrument_pairs)
{
- if (pair.colour == colours[i]) {
+ if(pair.colour == colours[i])
+ {
to_instrument_name[i] = pair.instrument;
}
}
}
}
+void DrumkitTab::drumkitFileChanged(const std::string& drumkit_file)
+{
+ if(drumkit_file.empty())
+ {
+ return;
+ }
+
+ DrumkitDOM dom;
+ if(parseDrumkitFile(drumkit_file, dom))
+ {
+ colour_instrument_pairs.clear();
+ for(const auto& clickmap : dom.metadata.clickmaps)
+ {
+ if(clickmap.colour.size() != 6)
+ {
+ continue;
+ }
+
+ try
+ {
+ auto hex_colour = std::stoul(clickmap.colour, nullptr, 16);
+ float red = (hex_colour >> 16 & 0xff) / 255.0f;
+ float green = (hex_colour >> 8 & 0xff) / 255.0f;
+ float blue = (hex_colour >> 0 & 0xff) / 255.0f;
+ Colour colour(red, green, blue);
+ colour_instrument_pairs.push_back({colour, clickmap.instrument});
+ }
+ catch(...)
+ {
+ // Not valid hex number
+ }
+ }
+
+ std::string path = getPath(drumkit_file);
+ init(path + "/" + dom.metadata.image, path + "/" + dom.metadata.image_map);
+ }
+}
+
} // GUI::
diff --git a/plugingui/drumkittab.h b/plugingui/drumkittab.h
index e42eb93..b1ccb73 100644
--- a/plugingui/drumkittab.h
+++ b/plugingui/drumkittab.h
@@ -49,8 +49,8 @@ class DrumkitTab
{
public:
DrumkitTab(Widget* parent,
- Settings& settings/*,
- SettingsNotifier& settings_notifier,
+ Settings& settings,
+ SettingsNotifier& settings_notifier/*,
Config& config*/);
// From Widget:
@@ -101,13 +101,15 @@ private:
Label instrument_name_label{this};
Settings& settings;
- // SettingsNotifier& settings_notifier;
+ SettingsNotifier& settings_notifier;
// Config& config;
void triggerAudition(int x, int y);
void highlightInstrument(int index);
void updateVelocityLabel();
void updateInstrumentLabel(int index);
+
+ void drumkitFileChanged(const std::string& drumkit_file);
};
} // GUI::
diff --git a/plugingui/image.cc b/plugingui/image.cc
index fc28d11..4b5622e 100644
--- a/plugingui/image.cc
+++ b/plugingui/image.cc
@@ -48,6 +48,11 @@ Image::Image(const std::string& filename)
: filename(filename)
{
Resource rc(filename);
+ if(!rc.valid())
+ {
+ setError();
+ return;
+ }
load(rc.data(), rc.size());
}
diff --git a/plugingui/mainwindow.cc b/plugingui/mainwindow.cc
index d2092cc..049d7aa 100644
--- a/plugingui/mainwindow.cc
+++ b/plugingui/mainwindow.cc
@@ -39,7 +39,7 @@ MainWindow::MainWindow(Settings& settings, void* native_window)
: Window(native_window)
, settings_notifier(settings)
, main_tab(this, settings, settings_notifier, config)
- , drumkit_tab(this, settings)
+ , drumkit_tab(this, settings, settings_notifier)
{
config.load();
diff --git a/plugingui/resource.cc b/plugingui/resource.cc
index 7d1c5b0..2435668 100644
--- a/plugingui/resource.cc
+++ b/plugingui/resource.cc
@@ -42,6 +42,8 @@ static bool nameIsInternal(const std::string& name)
Resource::Resource(const std::string& name)
{
+ isValid = false;
+
if(nameIsInternal(name))
{
// Use internal resource:
@@ -78,7 +80,11 @@ Resource::Resource(const std::string& name)
}
// Get the file size
- std::fseek(fp, 0, SEEK_END);
+ if(std::fseek(fp, 0, SEEK_END) == -1)
+ {
+ std::fclose(fp);
+ return;
+ }
size_t filesize = ftell(fp);
// Reserve space in the string for the data.
@@ -97,7 +103,7 @@ Resource::Resource(const std::string& name)
std::fclose(fp);
isInternal = false;
- }
+ }
isValid = true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:51:03 +0000