Mixes create filtered lists once
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
|
|
||||||
MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata, GeneralSettings & generalSettings, Firmware * firmware,
|
MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata, GeneralSettings & generalSettings, Firmware * firmware,
|
||||||
RawSourceItemModel * rawSourceItemModel, RawSwitchItemModel * rawSwitchItemModel) :
|
RawItemFilteredModel * rawSourceModel, RawItemFilteredModel * rawSwitchModel) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
ui(new Ui::MixerDialog),
|
ui(new Ui::MixerDialog),
|
||||||
model(model),
|
model(model),
|
||||||
@@ -35,8 +35,6 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata,
|
|||||||
lock(false)
|
lock(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
rawSourceModel = new RawItemFilteredModel(rawSourceItemModel, RawSource::InputSourceGroups | RawSource::ScriptsGroup, this);
|
|
||||||
rawSwitchModel = new RawItemFilteredModel(rawSwitchItemModel, RawSwitch::MixesContext, this);
|
|
||||||
|
|
||||||
QRegExp rx(CHAR_FOR_NAMES_REGEX);
|
QRegExp rx(CHAR_FOR_NAMES_REGEX);
|
||||||
QLabel * lb_fp[CPN_MAX_FLIGHT_MODES] = {ui->lb_FP0, ui->lb_FP1, ui->lb_FP2, ui->lb_FP3, ui->lb_FP4, ui->lb_FP5, ui->lb_FP6, ui->lb_FP7, ui->lb_FP8 };
|
QLabel * lb_fp[CPN_MAX_FLIGHT_MODES] = {ui->lb_FP0, ui->lb_FP1, ui->lb_FP2, ui->lb_FP3, ui->lb_FP4, ui->lb_FP5, ui->lb_FP6, ui->lb_FP7, ui->lb_FP8 };
|
||||||
@@ -154,8 +152,6 @@ MixerDialog::~MixerDialog()
|
|||||||
delete gvWeightGroup;
|
delete gvWeightGroup;
|
||||||
delete gvOffsetGroup;
|
delete gvOffsetGroup;
|
||||||
delete curveGroup;
|
delete curveGroup;
|
||||||
delete rawSourceModel;
|
|
||||||
delete rawSwitchModel;
|
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,6 @@
|
|||||||
|
|
||||||
class GVarGroup;
|
class GVarGroup;
|
||||||
class CurveGroup;
|
class CurveGroup;
|
||||||
class RawSourceItemModel;
|
|
||||||
class RawSwitchItemModel;
|
|
||||||
class RawItemFilteredModel;
|
class RawItemFilteredModel;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
@@ -38,7 +36,7 @@ class MixerDialog : public QDialog {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings, Firmware * firmware,
|
MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings, Firmware * firmware,
|
||||||
RawSourceItemModel * rawSourceItemModel, RawSwitchItemModel * rawSwitchItemModel);
|
RawItemFilteredModel * rawSourceModel, RawItemFilteredModel * rawSwitchModel);
|
||||||
~MixerDialog();
|
~MixerDialog();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -63,8 +61,6 @@ class MixerDialog : public QDialog {
|
|||||||
GVarGroup * gvOffsetGroup;
|
GVarGroup * gvOffsetGroup;
|
||||||
CurveGroup * curveGroup;
|
CurveGroup * curveGroup;
|
||||||
QCheckBox * cb_fp[CPN_MAX_FLIGHT_MODES];
|
QCheckBox * cb_fp[CPN_MAX_FLIGHT_MODES];
|
||||||
RawItemFilteredModel * rawSourceModel;
|
|
||||||
RawItemFilteredModel * rawSwitchModel;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _MIXERDIALOG_H_
|
#endif // _MIXERDIALOG_H_
|
||||||
|
|||||||
@@ -20,16 +20,23 @@
|
|||||||
|
|
||||||
#include "mixes.h"
|
#include "mixes.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
|
#include "rawitemfilteredmodel.h"
|
||||||
|
|
||||||
MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware,
|
MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware,
|
||||||
RawSourceItemModel * rawSourceItemModel, RawSwitchItemModel * rawSwitchItemModel):
|
RawSourceItemModel * rawSourceItemModel, RawSwitchItemModel * rawSwitchItemModel):
|
||||||
ModelPanel(parent, model, generalSettings, firmware),
|
ModelPanel(parent, model, generalSettings, firmware),
|
||||||
mixInserted(false),
|
mixInserted(false),
|
||||||
highlightedSource(0),
|
highlightedSource(0),
|
||||||
modelPrinter(firmware, generalSettings, model),
|
modelPrinter(firmware, generalSettings, model)
|
||||||
rawSourceItemModel(rawSourceItemModel),
|
|
||||||
rawSwitchItemModel(rawSwitchItemModel)
|
|
||||||
{
|
{
|
||||||
|
rawSourceModel = new RawItemFilteredModel(rawSourceItemModel, RawSource::InputSourceGroups | RawSource::ScriptsGroup, this);
|
||||||
|
connect(rawSourceModel, &RawItemFilteredModel::dataAboutToBeUpdated, this, &MixesPanel::onModelDataAboutToBeUpdated);
|
||||||
|
connect(rawSourceModel, &RawItemFilteredModel::dataUpdateComplete, this, &MixesPanel::onModelDataUpdateComplete);
|
||||||
|
|
||||||
|
rawSwitchModel = new RawItemFilteredModel(rawSwitchItemModel, RawSwitch::MixesContext, this);
|
||||||
|
connect(rawSwitchModel, &RawItemFilteredModel::dataAboutToBeUpdated, this, &MixesPanel::onModelDataAboutToBeUpdated);
|
||||||
|
connect(rawSwitchModel, &RawItemFilteredModel::dataUpdateComplete, this, &MixesPanel::onModelDataUpdateComplete);
|
||||||
|
|
||||||
QGridLayout * mixesLayout = new QGridLayout(this);
|
QGridLayout * mixesLayout = new QGridLayout(this);
|
||||||
|
|
||||||
mixersListWidget = new MixersListWidget(this, false); // TODO enum
|
mixersListWidget = new MixersListWidget(this, false); // TODO enum
|
||||||
@@ -63,6 +70,8 @@ MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
|
|||||||
|
|
||||||
MixesPanel::~MixesPanel()
|
MixesPanel::~MixesPanel()
|
||||||
{
|
{
|
||||||
|
delete rawSourceModel;
|
||||||
|
delete rawSwitchModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MixesPanel::update()
|
void MixesPanel::update()
|
||||||
@@ -178,7 +187,7 @@ void MixesPanel::gm_openMix(int index)
|
|||||||
|
|
||||||
MixData mixd(model->mixData[index]);
|
MixData mixd(model->mixData[index]);
|
||||||
|
|
||||||
MixerDialog *g = new MixerDialog(this, *model, &mixd, generalSettings, firmware, rawSourceItemModel, rawSwitchItemModel);
|
MixerDialog *g = new MixerDialog(this, *model, &mixd, generalSettings, firmware, rawSourceModel, rawSwitchModel);
|
||||||
if(g->exec()) {
|
if(g->exec()) {
|
||||||
model->mixData[index] = mixd;
|
model->mixData[index] = mixd;
|
||||||
emit modified();
|
emit modified();
|
||||||
@@ -532,3 +541,13 @@ void MixesPanel::clearMixes()
|
|||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MixesPanel::onModelDataAboutToBeUpdated()
|
||||||
|
{
|
||||||
|
lock = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MixesPanel::onModelDataUpdateComplete()
|
||||||
|
{
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|||||||
@@ -25,7 +25,10 @@
|
|||||||
#include "mixerslistwidget.h"
|
#include "mixerslistwidget.h"
|
||||||
#include "mixerdialog.h"
|
#include "mixerdialog.h"
|
||||||
#include "modelprinter.h"
|
#include "modelprinter.h"
|
||||||
#include "rawitemdatamodels.h"
|
|
||||||
|
class RawSourceItemModel;
|
||||||
|
class RawSwitchItemModel;
|
||||||
|
class RawItemFilteredModel;
|
||||||
|
|
||||||
class MixesPanel : public ModelPanel
|
class MixesPanel : public ModelPanel
|
||||||
{
|
{
|
||||||
@@ -52,7 +55,6 @@ class MixesPanel : public ModelPanel
|
|||||||
void moveMixDown();
|
void moveMixDown();
|
||||||
void mixerHighlight();
|
void mixerHighlight();
|
||||||
|
|
||||||
|
|
||||||
void mixerlistWidget_customContextMenuRequested(QPoint pos);
|
void mixerlistWidget_customContextMenuRequested(QPoint pos);
|
||||||
void mixerlistWidget_doubleClicked(QModelIndex index);
|
void mixerlistWidget_doubleClicked(QModelIndex index);
|
||||||
void mixerlistWidget_KeyPress(QKeyEvent *event);
|
void mixerlistWidget_KeyPress(QKeyEvent *event);
|
||||||
@@ -60,13 +62,16 @@ class MixesPanel : public ModelPanel
|
|||||||
void mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction action);
|
void mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction action);
|
||||||
void pasteMixerMimeData(const QMimeData * mimeData, int destIdx);
|
void pasteMixerMimeData(const QMimeData * mimeData, int destIdx);
|
||||||
|
|
||||||
|
void onModelDataAboutToBeUpdated();
|
||||||
|
void onModelDataUpdateComplete();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MixersListWidget * mixersListWidget;
|
MixersListWidget * mixersListWidget;
|
||||||
bool mixInserted;
|
bool mixInserted;
|
||||||
unsigned int highlightedSource;
|
unsigned int highlightedSource;
|
||||||
ModelPrinter modelPrinter;
|
ModelPrinter modelPrinter;
|
||||||
RawSourceItemModel *rawSourceItemModel;
|
RawItemFilteredModel *rawSourceModel;
|
||||||
RawSwitchItemModel *rawSwitchItemModel;
|
RawItemFilteredModel *rawSwitchModel;
|
||||||
|
|
||||||
int getMixerIndex(unsigned int dch);
|
int getMixerIndex(unsigned int dch);
|
||||||
bool gm_insertMix(int idx);
|
bool gm_insertMix(int idx);
|
||||||
|
|||||||
Reference in New Issue
Block a user