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

Bugfix for Ubuntu22.04 in SpectrumManager and warning in SPSInputLayer.h

Browse Source
This commit is contained in:
Gordon McCann 2022-06-19 21:48:12 -04:00
parent cabdcf6ed0
commit 7a02016774
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SpecProject/src/SPSInputLayer.cpp
View File

@ -65,7 +65,7 @@ namespace Specter {
ImGui::Text("-------Current Settings-------"); ImGui::Text("-------Current Settings-------");
ImGui::Text("Reaction Equation: "); ImGui::Text("Reaction Equation: ");
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text(m_rxnEqn.c_str()); ImGui::Text("%s", m_rxnEqn.c_str());
ImGui::Text("X1 Weight: %f", x1_weight.GetValue()); ImGui::Text("X1 Weight: %f", x1_weight.GetValue());
ImGui::Text("X2 Weight: %f", x2_weight.GetValue()); ImGui::Text("X2 Weight: %f", x2_weight.GetValue());
} }

8
Specter/src/Specter/Core/SpectrumManager.cpp
View File

@ -259,7 +259,7 @@ namespace Specter {
uint64_t scalerVal; uint64_t scalerVal;
for (auto& graph : m_graphMap) for (auto& graph : m_graphMap)
{ {
auto& scalerIter = m_scalerMap.find(graph.second->GetScaler()); auto scalerIter = m_scalerMap.find(graph.second->GetScaler());
if (scalerIter != m_scalerMap.end()) if (scalerIter != m_scalerMap.end())
{ {
scalerVal = *(scalerIter->second); scalerVal = *(scalerIter->second);
@ -278,7 +278,7 @@ namespace Specter {
void SpectrumManager::ClearGraph(const std::string& name) void SpectrumManager::ClearGraph(const std::string& name)
{ {
std::scoped_lock<std::mutex> guard(m_managerMutex); std::scoped_lock<std::mutex> guard(m_managerMutex);
auto& iter = m_graphMap.find(name); auto iter = m_graphMap.find(name);
if (iter != m_graphMap.end()) if (iter != m_graphMap.end())
iter->second->Clear(); iter->second->Clear();
} }
@ -286,7 +286,7 @@ namespace Specter {
void SpectrumManager::DrawGraph(const std::string& name) void SpectrumManager::DrawGraph(const std::string& name)
{ {
std::scoped_lock<std::mutex> guard(m_managerMutex); std::scoped_lock<std::mutex> guard(m_managerMutex);
auto& iter = m_graphMap.find(name); auto iter = m_graphMap.find(name);
if (iter != m_graphMap.end()) if (iter != m_graphMap.end())
iter->second->Draw(); iter->second->Draw();
} }
@ -294,7 +294,7 @@ namespace Specter {
const GraphArgs& SpectrumManager::GetGraphArgs(const std::string& name) const GraphArgs& SpectrumManager::GetGraphArgs(const std::string& name)
{ {
std::scoped_lock<std::mutex> guard(m_managerMutex); std::scoped_lock<std::mutex> guard(m_managerMutex);
auto& iter = m_graphMap.find(name); auto iter = m_graphMap.find(name);
if (iter != m_graphMap.end()) if (iter != m_graphMap.end())
return iter->second->GetArgs(); return iter->second->GetArgs();
return m_nullGraphResult; return m_nullGraphResult;