Skip to content

Commit

Permalink
updated the readme to reflect that there is a GUI method for selecting
Browse files Browse the repository at this point in the history
MIDI devices.  Also, added the start of a help tab.
  • Loading branch information
x37v committed Jun 4, 2009
1 parent 3a18657 commit c811f7a
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 7 deletions.
7 changes: 7 additions & 0 deletions HELP
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Key Bindings:
Ctrl+r:
Request the current "edit buffer" from the evolver.
This will grab the current "patch" from the evolver and update the state of this software to reflect the settings in the evolver.
You must have both the MIDI input and output of the evolver routed into the evolver_editor software for this to work.
Ctrl+<number>:
This will make the software display a specific tab. To get to the first tab, use Ctrl+1, the second tab, use Ctrl+2, etc.
11 changes: 6 additions & 5 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@ Building/Installing:
Running:
Use the -h switch to find out the command line options.

To get data from the evolver you have to connect the midi out of the evolver
To get data from the evolver you have to connect the MIDI out of the evolver
to the software, use the -i command line switch to specify the device to use
for that.
for that or use the GUI tab to select your MIDI in device.

To send data to the evolver you have to connect the midi out from this software
to your evolver, use the -o command line switch to do that.
To send data to the evolver you have to connect the MIDI out from this
software to your evolver, use the -o command line switch to do that or use
the GUI tab to select your MIDI out device.

Example:
I will use evolver_editor -l to list the midi i/o devices and then when
I will use evolver_editor -l to list the MIDI i/o devices and then when
I've found the ones I want to connect to, lets say input index 3 and
output index 2, I run the software using the following command:
./evolver_editor -i 3 -o 2
6 changes: 4 additions & 2 deletions evolver_editor.pro
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ HEADERS += include/common.hpp \
include/sequencer.hpp \
include/mididriverview.hpp \
include/mainparameters.hpp \
include/triggermidi.hpp
include/triggermidi.hpp \
include/helpview.hpp

SOURCES += \
src/model.cpp \
Expand Down Expand Up @@ -82,7 +83,8 @@ SOURCES += \
src/sequencer.cpp \
src/mididriverview.cpp \
src/mainparameters.cpp \
src/triggermidi.cpp
src/triggermidi.cpp \
src/helpview.cpp

DISTFILES += README
DISTFILES += COPYING
Expand Down
2 changes: 2 additions & 0 deletions include/applicationview.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class SequencerView;
class MidiDriverView;
class MainView;
class TriggerMIDIView;
class HelpView;

class ApplicationView : public QWidget {
Q_OBJECT
Expand All @@ -53,6 +54,7 @@ class ApplicationView : public QWidget {
MidiDriverView * mMidiDriver;
MainView * mMain;
TriggerMIDIView * mTriggerMIDI;
HelpView * mHelp;
};

#endif
Expand Down
32 changes: 32 additions & 0 deletions include/helpview.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright (c) 2009 Alex Norman. All rights reserved.
* http://www.x37v.info/
*
* This file is part of Alex's Evolver Editor.
*
* This Evolver Editor 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 Evolver Editor 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 software. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef HELP_VIEW_HPP
#define HELP_VIEW_HPP

#include <QTextEdit>

class HelpView : public QTextEdit {
Q_OBJECT
public:
HelpView(QWidget * parent = NULL);
};

#endif
4 changes: 4 additions & 0 deletions src/applicationview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "triggermidi.hpp"

#include "mididriverview.hpp"
#include "helpview.hpp"
#include "titledwidget.hpp"

QScrollArea * new_scroll_widget(QWidget * obj, QWidget * parent){
Expand Down Expand Up @@ -57,12 +58,15 @@ ApplicationView::ApplicationView(QWidget * parent) : QWidget(parent){

mMidiDriver = new MidiDriverView(this);

mHelp = new HelpView(this);

//add tabs and layout
mTabView->addTab(new_scroll_widget(mAudioAndEnvelopes, this), QString("audio and envelopes"));
mTabView->addTab(new_scroll_widget(mModulations, this), QString("modulations"));
mTabView->addTab(new_scroll_widget(mSequencer, this), QString("sequencer"));
mTabView->addTab(new_scroll_widget(triggerMainWidget, this), QString("main, trigger/midi params"));
mTabView->addTab(mMidiDriver, QString("midi io select"));
mTabView->addTab(mHelp, QString("help"));

mLayout->addWidget(mTabView);
mLayout->setContentsMargins(1,1,1,1);
Expand Down
18 changes: 18 additions & 0 deletions src/helpview.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#include "helpview.hpp"
#include <QTextStream>
#include <QString>
#include <QFile>

HelpView::HelpView(QWidget * parent) : QTextEdit(parent) {
setReadOnly(true);

QFile help_file("HELP");
if(help_file.open(QIODevice::ReadOnly | QIODevice::Text)){
QTextStream help_file_stream(&help_file);
setText(help_file_stream.readAll());
} else {
setText("help file not found");
}

help_file.close();
}

0 comments on commit c811f7a

Please sign in to comment.