Skip to content

Commit

Permalink
Do not display both default and custom names for Simulator widgets as…
Browse files Browse the repository at this point in the history
… too cluttered
  • Loading branch information
elecpower committed Jan 16, 2024
1 parent dbf1ab9 commit d4c9088
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions companion/src/simulation/simulatorwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ void SimulatorWidget::setupRadioWidgets()
continue;

swcfg = Board::SwitchType(radioSettings.switchConfig[i].type);
wname = RawSource(RawSourceType::SOURCE_TYPE_SWITCH, i).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_SWITCH, i).toString(nullptr, &radioSettings, Board::BOARD_UNKNOWN, false);
RadioSwitchWidget * sw = new RadioSwitchWidget(swcfg, wname, -1, ui->radioWidgetsHT);
sw->setIndex(i);
ui->radioWidgetsHTLayout->addWidget(sw);
Expand All @@ -622,7 +622,7 @@ void SimulatorWidget::setupRadioWidgets()
if (!(radioSettings.isInputAvailable(i) && radioSettings.isInputPot(i)))
continue;

wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, i).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, i).toString(nullptr, &radioSettings, Board::BOARD_UNKNOWN, false);
RadioKnobWidget * pot = new RadioKnobWidget(radioSettings.inputConfig[i].flexType, wname, 0, ui->radioWidgetsHT);
pot->setIndex(i);
ui->radioWidgetsHTLayout->insertWidget(midpos++, pot);
Expand All @@ -636,7 +636,7 @@ void SimulatorWidget::setupRadioWidgets()
if (!(radioSettings.isInputAvailable(i) && radioSettings.isInputSlider(i)))
continue;

wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, i).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_STICK, i).toString(nullptr, &radioSettings, Board::BOARD_UNKNOWN, false);
RadioFaderWidget * sl = new RadioFaderWidget(wname, 0, ui->radioWidgetsVC);
sl->setIndex(i);
ui->VCGridLayout->addWidget(sl, 0, fc++, 1, 1);
Expand All @@ -647,7 +647,7 @@ void SimulatorWidget::setupRadioWidgets()
int tc = 0;
int tridx = ttlSticks;
for (i = 0; i < extraTrims; i += 1, tridx += 1) {
wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, tridx).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, tridx).toString(nullptr, &radioSettings, Board::BOARD_UNKNOWN, false);
wname = wname.left(1) % wname.right(1);
RadioTrimWidget * tw = new RadioTrimWidget(Qt::Vertical, ui->radioWidgetsVC);
tw->setIndices(tridx, tridx * 2, tridx * 2 + 1);
Expand Down

0 comments on commit d4c9088

Please sign in to comment.