DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lock m_renderMain in Grapher::TryInitializeGraph to avoid modifying m_graph during rendering (#1430)

Browse Source
This commit is contained in:
Hongxu Xu 2020-11-12 01:40:39 +08:00 committed by GitHub
parent 483dacbeff
commit 296cf038b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GraphControl/Control/Grapher.cpp
View File

@ -118,7 +118,7 @@ namespace GraphControl
{
if (m_graph != nullptr && m_renderMain != nullptr)
{
if(auto renderer = m_graph->GetRenderer())
if (auto renderer = m_graph->GetRenderer())
{
HRESULT hr;
@ -281,7 +281,7 @@ namespace GraphControl
void Grapher::PlotGraph(bool keepCurrentView)
{
TryPlotGraph(keepCurrentView,false);
TryPlotGraph(keepCurrentView, false);
}
task<void> Grapher::TryPlotGraph(bool keepCurrentView, bool shouldRetry)
@ -587,7 +587,7 @@ namespace GraphControl
auto lineColor = eq->LineColor;
graphColors.emplace_back(lineColor.R, lineColor.G, lineColor.B, lineColor.A);
if (eq->GraphedEquation)
if (eq->GraphedEquation)
{
if (!eq->HasGraphError && eq->IsSelected)
{
@ -1085,7 +1085,6 @@ void Grapher::OnGraphBackgroundPropertyChanged(Windows::UI::Color /*oldValue*/,
}
}
void Grapher::OnGridLinesColorPropertyChanged(Windows::UI::Color /*oldValue*/, Windows::UI::Color newValue)
{
if (m_renderMain != nullptr && m_graph != nullptr)
@ -1106,13 +1105,14 @@ void Grapher::OnLineWidthPropertyChanged(double oldValue, double newValue)
m_renderMain->SetPointRadius(LineWidth + 1);
m_renderMain->RunRenderPass();
TraceLogger::GetInstance()->LogLineWidthChanged();
TraceLogger::GetInstance()->LogLineWidthChanged();
}
}
}
optional<vector<shared_ptr<Graphing::IEquation>>> Grapher::TryInitializeGraph(bool keepCurrentView, const IExpression* graphingExp)
{
critical_section::scoped_lock lock(m_renderMain->GetCriticalSection());
if (keepCurrentView || IsKeepCurrentView)
{
auto renderer = m_graph->GetRenderer();