gwm17/Daqromancy
1
0
Fork 0
mirror of https://github.com/gwm17/Daqromancy.git synced 2024-11-22 18:58:51 -05:00
Code Issues Projects Releases Wiki Activity

Squash some bugs found for compiling with g++

Browse Source
This commit is contained in:
Gordon McCann 2022-09-29 14:23:28 -04:00
parent b3901ef37e
commit 83d81ed1d7
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/ThreadSafeQueue.h
View File

@ -31,7 +31,7 @@ namespace Daqromancy {
std::scoped_lock<std::mutex> guard(m_queueMutex); std::scoped_lock<std::mutex> guard(m_queueMutex);
m_queue.push_front(data); m_queue.push_front(data);
std::scoped_lock<std::mutex> guard(m_conditionMutex); std::scoped_lock<std::mutex> condGuard(m_conditionMutex);
m_conditional.notify_one(); m_conditional.notify_one();
} }

12
src/Editor/SyncDialog.cpp
View File

@ -4,16 +4,6 @@
namespace Daqromancy { namespace Daqromancy {
static std::string SyncMethodToString(SyncMethod method)
{
switch (method)
{
case SyncMethod::SIn_TrigOut: return "SyncIn-TrigOut";
case SyncMethod::None: return "None";
}
return "None";
}
static std::string StartTypeToString(SyncStartType type) static std::string StartTypeToString(SyncStartType type)
{ {
switch (type) switch (type)
@ -46,7 +36,7 @@ namespace Daqromancy {
{ {
if (ImGui::BeginCombo("Method", SyncMethodToString(m_syncArgs.syncMethod).c_str())) if (ImGui::BeginCombo("Method", SyncMethodToString(m_syncArgs.syncMethod).c_str()))
{ {
if (ImGui::Selectable("SyncIn-TrigOut", SyncMethod::SIn_TrigOut == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups)) if (ImGui::Selectable("S-In TrigOut", SyncMethod::SIn_TrigOut == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups))
m_syncArgs.syncMethod = SyncMethod::SIn_TrigOut; m_syncArgs.syncMethod = SyncMethod::SIn_TrigOut;
if (ImGui::Selectable("None", SyncMethod::None == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups)) if (ImGui::Selectable("None", SyncMethod::None == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups))
m_syncArgs.syncMethod = SyncMethod::None; m_syncArgs.syncMethod = SyncMethod::None;