More timer tweaks
This commit is contained in:
@@ -78,10 +78,9 @@ QString TimerData::valToString() const
|
|||||||
return valToString(val);
|
return valToString(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TimerData::setCountdownBeep(const unsigned int value)
|
void TimerData::countdownBeepChanged()
|
||||||
{
|
{
|
||||||
countdownBeep = value;
|
if (countdownBeep == COUNTDOWNBEEP_SILENT)
|
||||||
if (value == COUNTDOWNBEEP_SILENT)
|
|
||||||
countdownStart = 0;
|
countdownStart = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -166,7 +165,7 @@ AbstractStaticItemModel * TimerData::countdownStartItemModel()
|
|||||||
AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
|
AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
|
||||||
mdl->setName(AIM_TIMER_COUNTDOWNSTART);
|
mdl->setName(AIM_TIMER_COUNTDOWNSTART);
|
||||||
|
|
||||||
for (int i = COUNTDOWNSTART_LAST - 1; i >= COUNTDOWNSTART_FIRST; i--) {
|
for (int i = COUNTDOWNSTART_LAST; i >= COUNTDOWNSTART_FIRST; i--) {
|
||||||
mdl->appendToItemList(countdownStartToString(i), i);
|
mdl->appendToItemList(countdownStartToString(i), i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ class TimerData {
|
|||||||
QString persistentToString(const bool verbose = true) const;
|
QString persistentToString(const bool verbose = true) const;
|
||||||
QString pvalueToString() const;
|
QString pvalueToString() const;
|
||||||
QString valToString() const;
|
QString valToString() const;
|
||||||
void setCountdownBeep(const unsigned int value);
|
void countdownBeepChanged();
|
||||||
|
|
||||||
static QString countdownBeepToString(const int value);
|
static QString countdownBeepToString(const int value);
|
||||||
static QString countdownStartToString(const int value);
|
static QString countdownStartToString(const int value);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
constexpr char FIM_TIMERSWITCH[] {"Timer Switch"};
|
constexpr char FIM_TIMERSWITCH[] {"Timer Switch"};
|
||||||
constexpr char FIM_THRSOURCE[] {"Throttle Source"};
|
constexpr char FIM_THRSOURCE[] {"Throttle Source"};
|
||||||
|
|
||||||
TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware,
|
TimerPanel::TimerPanel(QWidget * parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware,
|
||||||
QWidget * prevFocus, FilteredItemModelFactory * panelFilteredModels, CompoundItemModelFactory * panelItemModels):
|
QWidget * prevFocus, FilteredItemModelFactory * panelFilteredModels, CompoundItemModelFactory * panelItemModels):
|
||||||
ModelPanel(parent, model, generalSettings, firmware),
|
ModelPanel(parent, model, generalSettings, firmware),
|
||||||
timer(timer),
|
timer(timer),
|
||||||
@@ -58,19 +58,20 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
|
|||||||
|
|
||||||
ui->countdownBeep->setModel(panelItemModels->getItemModel(AIM_TIMER_COUNTDOWNBEEP));
|
ui->countdownBeep->setModel(panelItemModels->getItemModel(AIM_TIMER_COUNTDOWNBEEP));
|
||||||
ui->countdownBeep->setField(timer.countdownBeep, this);
|
ui->countdownBeep->setField(timer.countdownBeep, this);
|
||||||
|
connect(ui->countdownBeep, SIGNAL(currentDataChanged(int)), this, SLOT(onCountdownBeepDataChanged(int)));
|
||||||
|
|
||||||
ui->value->setMaximumTime(firmware->getMaxTimerStart());
|
ui->value->setMaximumTime(firmware->getMaxTimerStart());
|
||||||
|
|
||||||
ui->minuteBeep->setField(timer.minuteBeep, this);
|
ui->minuteBeep->setField(timer.minuteBeep, this);
|
||||||
|
|
||||||
if (!firmware->getCapability(PermTimers)) {
|
if (firmware->getCapability(PermTimers)) {
|
||||||
ui->persistent->hide();
|
|
||||||
ui->persistentValue->hide();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ui->persistent->setModel(panelItemModels->getItemModel(AIM_TIMER_PERSISTENT));
|
ui->persistent->setModel(panelItemModels->getItemModel(AIM_TIMER_PERSISTENT));
|
||||||
ui->persistent->setField(timer.persistent, this);
|
ui->persistent->setField(timer.persistent, this);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
ui->persistent->hide();
|
||||||
|
ui->persistentValue->hide();
|
||||||
|
}
|
||||||
|
|
||||||
ui->countdownStart->setModel(panelItemModels->getItemModel(AIM_TIMER_COUNTDOWNSTART));
|
ui->countdownStart->setModel(panelItemModels->getItemModel(AIM_TIMER_COUNTDOWNSTART));
|
||||||
ui->countdownStart->setField(timer.countdownStart, this);
|
ui->countdownStart->setField(timer.countdownStart, this);
|
||||||
@@ -107,12 +108,8 @@ void TimerPanel::update()
|
|||||||
|
|
||||||
ui->countdownBeep->updateValue();
|
ui->countdownBeep->updateValue();
|
||||||
ui->minuteBeep->updateValue();
|
ui->minuteBeep->updateValue();
|
||||||
if (firmware->getCapability(PermTimers)) {
|
|
||||||
ui->persistent->updateValue();
|
|
||||||
ui->persistentValue->setText(timer.pvalueToString());
|
|
||||||
}
|
|
||||||
ui->countdownStart->updateValue();
|
ui->countdownStart->updateValue();
|
||||||
if(timer.countdownBeep == TimerData::COUNTDOWNBEEP_SILENT) {
|
if (timer.countdownBeep == TimerData::COUNTDOWNBEEP_SILENT) {
|
||||||
ui->countdownStartLabel->setEnabled(false);
|
ui->countdownStartLabel->setEnabled(false);
|
||||||
ui->countdownStart->setEnabled(false);
|
ui->countdownStart->setEnabled(false);
|
||||||
}
|
}
|
||||||
@@ -120,6 +117,10 @@ void TimerPanel::update()
|
|||||||
ui->countdownStartLabel->setEnabled(true);
|
ui->countdownStartLabel->setEnabled(true);
|
||||||
ui->countdownStart->setEnabled(true);
|
ui->countdownStart->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
if (firmware->getCapability(PermTimers)) {
|
||||||
|
ui->persistent->updateValue();
|
||||||
|
ui->persistentValue->setText(timer.pvalueToString());
|
||||||
|
}
|
||||||
lock = false;
|
lock = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,6 +173,12 @@ void TimerPanel::onItemModelUpdateComplete()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TimerPanel::onCountdownBeepDataChanged(int index)
|
||||||
|
{
|
||||||
|
timer.countdownBeepChanged();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
#define FAILSAFE_CHANNEL_HOLD 2000
|
#define FAILSAFE_CHANNEL_HOLD 2000
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ class TimerPanel : public ModelPanel
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware,
|
TimerPanel(QWidget * parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware,
|
||||||
QWidget *prevFocus, FilteredItemModelFactory * panelFilteredModels, CompoundItemModelFactory * panelItemModels);
|
QWidget * prevFocus, FilteredItemModelFactory * panelFilteredModels, CompoundItemModelFactory * panelItemModels);
|
||||||
virtual ~TimerPanel();
|
virtual ~TimerPanel();
|
||||||
|
|
||||||
virtual void update();
|
virtual void update();
|
||||||
@@ -50,6 +50,7 @@ class TimerPanel : public ModelPanel
|
|||||||
void on_value_editingFinished();
|
void on_value_editingFinished();
|
||||||
void onItemModelAboutToBeUpdated();
|
void onItemModelAboutToBeUpdated();
|
||||||
void onItemModelUpdateComplete();
|
void onItemModelUpdateComplete();
|
||||||
|
void onCountdownBeepDataChanged(int index);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void nameChanged();
|
void nameChanged();
|
||||||
|
|||||||
Reference in New Issue
Block a user