mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-01-12 17:00:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

try to fix Visual Studio compile error

Browse Source
This commit is contained in:
jkriege2 2019-04-22 18:35:08 +02:00
parent 62fc116296
commit 52cd2dc2d8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp
View File

@ -36,14 +36,14 @@ JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraph(JKQTBasePlotter *pa
fdata.varcount=0; fdata.varcount=0;
function=""; function="";
parameterColumn=-1; parameterColumn=-1;
setPlotFunctionFunctor(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)); setPlotFunctionFunctor(jkqtpPlotFunctionType(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)));
efdata.parser=new JKQTPMathParser(); efdata.parser=new JKQTPMathParser();
efdata.node=nullptr; efdata.node=nullptr;
efdata.varcount=0; efdata.varcount=0;
errorFunction=""; errorFunction="";
errorParameterColumn=-1; errorParameterColumn=-1;
setErrorPlotFunction(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)); setErrorPlotFunction(jkqtpPlotFunctionType(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)));
} }
JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraph(JKQTPlotter *parent): JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraph(JKQTPlotter *parent):
@ -133,8 +133,8 @@ void JKQTPXParsedFunctionLineGraph::createPlotData(bool /*collectParams*/)
//qDebug()<<QString("parser error: %1").arg(E.what()); //qDebug()<<QString("parser error: %1").arg(E.what());
} }
setPlotFunctionFunctor(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)); setPlotFunctionFunctor(jkqtpPlotFunctionType(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)));
setErrorPlotFunction(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)); setErrorPlotFunction(jkqtpPlotFunctionType(std::bind(&JKQTPXParsedFunctionLineGraph::JKQTPXParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)));
//qint64 t=timer.elapsed(); //qint64 t=timer.elapsed();
JKQTPXFunctionLineGraph::createPlotData(false); JKQTPXFunctionLineGraph::createPlotData(false);
@ -200,14 +200,14 @@ JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraph(JKQTBasePlotter *pa
fdata.varcount=0; fdata.varcount=0;
function=""; function="";
parameterColumn=-1; parameterColumn=-1;
setPlotFunctionFunctor(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)); setPlotFunctionFunctor(jkqtpPlotFunctionType(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)));
efdata.parser=new JKQTPMathParser(); efdata.parser=new JKQTPMathParser();
efdata.node=nullptr; efdata.node=nullptr;
efdata.varcount=0; efdata.varcount=0;
errorFunction=""; errorFunction="";
errorParameterColumn=-1; errorParameterColumn=-1;
setErrorPlotFunction(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)); setErrorPlotFunction(jkqtpPlotFunctionType(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)));
} }
JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraph(JKQTPlotter *parent): JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraph(JKQTPlotter *parent):
@ -218,14 +218,14 @@ JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraph(JKQTPlotter *parent
fdata.varcount=0; fdata.varcount=0;
function=""; function="";
parameterColumn=-1; parameterColumn=-1;
setPlotFunctionFunctor(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)); setPlotFunctionFunctor(jkqtpPlotFunctionType(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)));
efdata.parser=new JKQTPMathParser(); efdata.parser=new JKQTPMathParser();
efdata.node=nullptr; efdata.node=nullptr;
efdata.varcount=0; efdata.varcount=0;
errorFunction=""; errorFunction="";
errorParameterColumn=-1; errorParameterColumn=-1;
setErrorPlotFunction(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)); setErrorPlotFunction(jkqtpPlotFunctionType(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)));
} }
JKQTPYParsedFunctionLineGraph::~JKQTPYParsedFunctionLineGraph() JKQTPYParsedFunctionLineGraph::~JKQTPYParsedFunctionLineGraph()
@ -311,8 +311,8 @@ void JKQTPYParsedFunctionLineGraph::createPlotData(bool /*collectParams*/)
qDebug()<<QString("parser error: %1").arg(E.what()); qDebug()<<QString("parser error: %1").arg(E.what());
} }
setPlotFunctionFunctor(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)); setPlotFunctionFunctor(jkqtpPlotFunctionType(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &fdata)));
setErrorPlotFunction(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)); setErrorPlotFunction(jkqtpPlotFunctionType(std::bind(&JKQTPYParsedFunctionLineGraph::JKQTPYParsedFunctionLineGraphFunction, std::placeholders::_1, std::placeholders::_2, &efdata)));
//qint64 t=timer.elapsed(); //qint64 t=timer.elapsed();
JKQTPYFunctionLineGraph::createPlotData(false); JKQTPYFunctionLineGraph::createPlotData(false);