diff options
| author | André Nusser <andre.nusser@googlemail.com> | 2018-06-08 22:17:20 +0200 | 
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-08-12 11:13:49 +0200 | 
| commit | 2da458423c1fa95d3000d94105f215c6a603094b (patch) | |
| tree | 13db7d1b4104a5d3b60c73854d5d26396ba40fc1 /plugingui | |
| parent | 592f05fa549c7e680e502f569c27e71177361ad6 (diff) | |
Add tab for drumkit.
Diffstat (limited to 'plugingui')
| -rw-r--r-- | plugingui/Makefile.am | 1 | ||||
| -rw-r--r-- | plugingui/drumkittab.cc | 116 | ||||
| -rw-r--r-- | plugingui/drumkittab.h | 75 | ||||
| -rw-r--r-- | plugingui/mainwindow.cc | 2 | ||||
| -rw-r--r-- | plugingui/mainwindow.h | 2 | 
5 files changed, 196 insertions, 0 deletions
| diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 3f96ff8..c726088 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -67,6 +67,7 @@ nodist_libdggui_la_SOURCES = \  	directory.cc \  	diskstreamingframecontent.cc \  	drumkitframecontent.cc \ +	drumkittab.cc \  	eventhandler.cc \  	filebrowser.cc \  	font.cc \ diff --git a/plugingui/drumkittab.cc b/plugingui/drumkittab.cc new file mode 100644 index 0000000..3f6cd5f --- /dev/null +++ b/plugingui/drumkittab.cc @@ -0,0 +1,116 @@ +/* -*- Mode: c++ -*- */ +/*************************************************************************** + *            drumkittab.cc + * + *  Fri Jun  8 21:50:03 CEST 2018 + *  Copyright 2018 André Nusser + *  andre.nusser@googlemail.com + ****************************************************************************/ + +/* + *  This file is part of DrumGizmo. + * + *  DrumGizmo is free software; you can redistribute it and/or modify + *  it under the terms of the GNU Lesser General Public License as published by + *  the Free Software Foundation; either version 3 of the License, or + *  (at your option) any later version. + * + *  DrumGizmo 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 Lesser General Public License for more details. + * + *  You should have received a copy of the GNU Lesser General Public License + *  along with DrumGizmo; if not, write to the Free Software + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA. + */ +#include "drumkittab.h" + +#include <iomanip> +#include <sstream> + +#include "cpp11fix.h" // required for c++11 +#include "painter.h" +#include "settings.h" + +namespace GUI +{ + +DrumkitTab::DrumkitTab(Widget* parent, +                       Settings& settings, +                       SettingsNotifier& settings_notifier, +                       Config& config) +	: Widget(parent) +	, settings(settings) +	, settings_notifier(settings_notifier) +	, config(config) +{ +	loadImageFiles("/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(); +} + +void DrumkitTab::resize(std::size_t width, std::size_t height) +{ +	Widget::resize(width, height); + +	if (drumkit_image) { +		Painter painter(*this); +		painter.clear(); +		painter.drawImage(0 , 0, *drumkit_image); +	} + +	velocity_label.move(10, height-velocity_label.height()-5); +} + +void DrumkitTab::buttonEvent(ButtonEvent* buttonEvent) +{ +	if (buttonEvent->button == MouseButton::left && +	    buttonEvent->direction == GUI::Direction::down) +	{ +		triggerAudition(buttonEvent->x, buttonEvent->y); +	} +} + +void DrumkitTab::scrollEvent(ScrollEvent* scrollEvent) +{ +	current_velocity -=  0.01*scrollEvent->delta; +	current_velocity = std::max(std::min(current_velocity, 1.0f), 0.0f); +	updateVelocityLabel(); +	velocity_label.resizeToText(); + +	triggerAudition(scrollEvent->x, scrollEvent->y); +} + +void DrumkitTab::triggerAudition(int x, int y) +{ +	auto map_colour = map_image->getPixel(x, y); + +	// TODO: convert color to instrument +	if (map_colour != Colour(0)) +	{ +		return; +	} + +	++settings.audition_counter; +	settings.audition_instrument = "Snare"; +	settings.audition_velocity = current_velocity; +} + +void DrumkitTab::updateVelocityLabel() +{ +	std::stringstream stream; +	stream << std::fixed << std::setprecision(2) << current_velocity; +	velocity_label.setText("Velocity: " + stream.str()); +} + +// FIXME: this should actually be done somewhere else maybe? +void DrumkitTab::loadImageFiles(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); +} + +} // GUI:: diff --git a/plugingui/drumkittab.h b/plugingui/drumkittab.h new file mode 100644 index 0000000..1a0eb7a --- /dev/null +++ b/plugingui/drumkittab.h @@ -0,0 +1,75 @@ +/* -*- Mode: c++ -*- */ +/*************************************************************************** + *            drumkittab.h + * + *  Fri Jun  8 21:50:03 CEST 2018 + *  Copyright 2018 André Nusser + *  andre.nusser@googlemail.com + ****************************************************************************/ + +/* + *  This file is part of DrumGizmo. + * + *  DrumGizmo is free software; you can redistribute it and/or modify + *  it under the terms of the GNU Lesser General Public License as published by + *  the Free Software Foundation; either version 3 of the License, or + *  (at your option) any later version. + * + *  DrumGizmo 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 Lesser General Public License for more details. + * + *  You should have received a copy of the GNU Lesser General Public License + *  along with DrumGizmo; if not, write to the Free Software + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA. + */ +#pragma once + +#include <memory> +#include <string> + +#include "image.h" +#include "label.h" +#include "widget.h" + +struct Settings; +class SettingsNotifier; + +namespace GUI +{ + +class Config; + +class DrumkitTab +	: public Widget +{ +public: +	DrumkitTab(Widget* parent, +	           Settings& settings, +	           SettingsNotifier& settings_notifier, +	           Config& config); + +	// From Widget: +	void resize(std::size_t width, std::size_t height) override; +	void buttonEvent(ButtonEvent* buttonEvent) override; +	void scrollEvent(ScrollEvent* scrollEvent) override; + +	void loadImageFiles(std::string const& image_file, std::string const& map_file); + +private: +	float current_velocity = .5; + +	std::unique_ptr<Image> drumkit_image; +	std::unique_ptr<Image> map_image; +	Label velocity_label{this}; + +	Settings& settings; +	SettingsNotifier& settings_notifier; +	Config& config; + +	void triggerAudition(int x, int y); +	void updateVelocityLabel(); +}; + +} // GUI:: diff --git a/plugingui/mainwindow.cc b/plugingui/mainwindow.cc index d98d335..944eb71 100644 --- a/plugingui/mainwindow.cc +++ b/plugingui/mainwindow.cc @@ -39,6 +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, settings_notifier, config)  {  	config.load(); @@ -49,6 +50,7 @@ MainWindow::MainWindow(Settings& settings, void* native_window)  	tabs.move(16, 0); // x-offset to make room for the left side bar.  	tabs.addTab("Main", &main_tab); +	tabs.addTab("Drumkit", &drumkit_tab);  	tabs.addTab("About", &about_tab);  } diff --git a/plugingui/mainwindow.h b/plugingui/mainwindow.h index 6ab3996..ea05ad6 100644 --- a/plugingui/mainwindow.h +++ b/plugingui/mainwindow.h @@ -29,6 +29,7 @@  #include <settings.h>  #include "abouttab.h" +#include "drumkittab.h"  #include "image.h"  #include "tabwidget.h"  #include "texturedbox.h" @@ -65,6 +66,7 @@ private:  	TabWidget tabs{this};  	MainTab main_tab; +	DrumkitTab drumkit_tab;  	AboutTab about_tab{&tabs};  	Image back{":resources/bg.png"}; | 
