From 454b3daabafc7dc86b9fa7ba8f72d02b4557d91a Mon Sep 17 00:00:00 2001 From: Yohann Dedy Date: Tue, 1 Nov 2016 16:05:09 +0100 Subject: [PATCH] Added boost library Preset set to zero by default --- DoepferPocketQT.pro | 9 +++++++++ src/mainwindow.cpp | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/DoepferPocketQT.pro b/DoepferPocketQT.pro index 2e94f0f..b72351e 100644 --- a/DoepferPocketQT.pro +++ b/DoepferPocketQT.pro @@ -16,3 +16,12 @@ include($$PWD/libs/QMidi/QMidi.pri) HEADERS += \ src/mainwindow.h \ src/settingswindow.h + +macx { + QMAKE_CXXFLAGS += -std=c++11 + + _BOOST_PATH = /usr/local/Cellar/boost/1.62.0 + INCLUDEPATH += "$${_BOOST_PATH}/include/" + LIBS += -L$${_BOOST_PATH}/lib + LIBS += $${_BOOST_PATH}/lib/libboost_system.a +} diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8af0134..dd018f3 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include mainWindow::mainWindow(QWidget *parent) : QMainWindow(parent), @@ -18,9 +20,10 @@ mainWindow::mainWindow(QWidget *parent) : _prefixPocketC = {0xF0,0x00,0x20,0x20,0x14,0x00}; _midiIn->setIgnoreTypes(false, false, false); + // Temporary default starting values (all parameters set to zero) for(int i=0; i<128; i++){ for(int j=0; j<48; j++){ - _preset[i][j] = i+j; + _preset[i][j] = 0; } } @@ -55,7 +58,6 @@ mainWindow::mainWindow(QWidget *parent) : mainLayout->addWidget(getPresetButton); connect(getPresetButton, SIGNAL(clicked(bool)),this,SLOT(sendSingleDumpRequest())); - // Table for(int i=0; i<128; i++){ QString defaultCelString = QString("Preset #%1").arg(i+1); @@ -65,7 +67,7 @@ mainWindow::mainWindow(QWidget *parent) : connect(_presetsList,SIGNAL(itemSelectionChanged()),this,SLOT(updateTable())); QStringList settingsList; - settingsList << "Channel" << "Description"<< "Type" << "Parameter"; + settingsList << "Channel" << "Type" << "Parameter" << "Description" ; _presetSettingsTable->setRowCount(16); _presetSettingsTable->setColumnCount(4); _presetSettingsTable->setHorizontalHeaderLabels(settingsList);