Skip to content

Fix bug where PulsePal trigger and gate selections change on update #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aacuevas merged 4 commits into from
Sep 17, 2018
Merged

Fix bug where PulsePal trigger and gate selections change on update #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fbbc23
Add float and double cases where missing in InfoObjects
ethanbb Jul 23, 2018
ebe9d2b
Merge pull request #244 from tne-lab/development
aacuevas Jul 23, 2018
e983f1d
Make m_triggerSelected and m_gateSelected always reflect the ComboBox id
ethanbb Jul 27, 2018
184cc10
Guard against m_fooSelected being assigned 0
ethanbb Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions Source/Plugins/PulsePalOutput/PulsePalOutputEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ void ChannelTriggerInterface::updateSources()
EventSources s;
String name;
processor->clearEventSources();
triggerSelector->clear();
gateSelector->clear();
triggerSelector->clear(dontSendNotification);
gateSelector->clear(dontSendNotification);
triggerSelector->addItem("Trigger", 1);
gateSelector->addItem("Gate", 1);
int nextItemTrig = 2;
Expand Down Expand Up @@ -189,17 +189,14 @@ void ChannelTriggerInterface::updateSources()
if (m_triggerSelected > triggerSelector->getNumItems())
{
m_triggerSelected = triggerSelector->getNumItems();
triggerSelector->setSelectedId(m_triggerSelected);
}
else
triggerSelector->setSelectedId(m_triggerSelected);
triggerSelector->setSelectedId(m_triggerSelected);

if (m_gateSelected > triggerSelector->getNumItems())
{
m_gateSelected = gateSelector->getNumItems();
gateSelector->setSelectedId(m_gateSelected);
}
else
gateSelector->setSelectedId(m_gateSelected);
gateSelector->setSelectedId(m_gateSelected);
}

void ChannelTriggerInterface::comboBoxChanged(ComboBox* comboBoxThatHasChanged)
Expand All @@ -208,19 +205,15 @@ void ChannelTriggerInterface::comboBoxChanged(ComboBox* comboBoxThatHasChanged)
{
processor->setParameter(0, channelNumber);
processor->setParameter(1, (float) comboBoxThatHasChanged->getSelectedId() - 2);
if (comboBoxThatHasChanged->getSelectedId() - 1 > 0)
m_triggerSelected = comboBoxThatHasChanged->getSelectedId() - 1;
else
m_triggerSelected = 1;
m_triggerSelected = jmax(1, comboBoxThatHasChanged->getSelectedId());

}
else if (comboBoxThatHasChanged == gateSelector)
{
processor->setParameter(0, channelNumber);
processor->setParameter(2, (float) comboBoxThatHasChanged->getSelectedId() - 2);
if (comboBoxThatHasChanged->getSelectedId() - 1 > 0)
m_gateSelected = comboBoxThatHasChanged->getSelectedId() - 1;
else
m_gateSelected = 1; }
m_gateSelected = jmax(1, comboBoxThatHasChanged->getSelectedId());
}
}

int ChannelTriggerInterface::getTriggerChannel()
Expand Down
4 changes: 4 additions & 0 deletions Source/Processors/Channel/InfoObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ size_t EventChannel::getTypeByteSize(EventChannel::EventChannelTypes type)
case UINT32_ARRAY: return sizeof(uint32);
case INT64_ARRAY: return sizeof(int64);
case UINT64_ARRAY: return sizeof(uint64);
case FLOAT_ARRAY: return sizeof(float);
case DOUBLE_ARRAY: return sizeof(double);
default: return sizeof(char);
}
}
Expand All @@ -426,6 +428,8 @@ void EventChannel::setDefaultNameAndDescription()
case UINT32_ARRAY: name = "UINT32"; break;
case INT64_ARRAY: name = "INT64"; break;
case UINT64_ARRAY: name = "UINT64"; break;
case FLOAT_ARRAY: name = "FLOAT"; break;
case DOUBLE_ARRAY: name = "DOUBLE"; break;
default:
setName("INVALID");
setDescription("Invalid channel");
Expand Down