caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler error due to file renaming

Browse Source
This commit is contained in:
Jan Käberich 2020-12-12 14:35:23 +01:00
parent 6e55eb02dd
commit 2868c2cb74
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/PC_Application/Traces/tracetouchstoneexport.cpp
View File

@ -1,5 +1,5 @@
#include "tracetouchstoneexport.h" #include "tracetouchstoneexport.h"
#include "ui_traceexportdialog.h" #include "ui_tracetouchstoneexport.h"
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QFileDialog>
#include "touchstone.h" #include "touchstone.h"

17
Software/PC_Application/Traces/tracexyplot.cpp
View File

@ -785,18 +785,6 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo
return ret; return ret;
} }
//QPoint TraceXYPlot::dataToPixel(Trace::Data d)
//{
// if(d.x < XAxis.rangeMin || d.x > XAxis.rangeMax) {
// return QPoint();
// }
// auto y = traceToCoordinate(d.y, YAxis[0].type);
// QPoint p;
// p.setX(Util::Scale<double>(d.x, XAxis.rangeMin, XAxis.rangeMax, plotAreaLeft, plotAreaLeft + plotAreaWidth));
// p.setY(Util::Scale<double>(y, YAxis[0].rangeMin, YAxis[0].rangeMax, plotAreaBottom, 0));
// return p;
//}
QPoint TraceXYPlot::plotValueToPixel(QPointF plotValue, int Yaxis) QPoint TraceXYPlot::plotValueToPixel(QPointF plotValue, int Yaxis)
{ {
QPoint p; QPoint p;
@ -815,11 +803,6 @@ QPointF TraceXYPlot::pixelToPlotValue(QPoint pixel, int Yaxis)
QPoint TraceXYPlot::markerToPixel(TraceMarker *m) QPoint TraceXYPlot::markerToPixel(TraceMarker *m)
{ {
QPoint ret = QPoint();
// if(m->isTimeDomain() != (XAxis.type != XAxisType::Frequency)) {
// // invalid domain
// return ret;
// }
auto t = m->getTrace(); auto t = m->getTrace();
QPointF plotPoint = traceToCoordinate(t, t->index(m->getPosition()), YAxis[0].type); QPointF plotPoint = traceToCoordinate(t, t->index(m->getPosition()), YAxis[0].type);
return plotValueToPixel(plotPoint, 0); return plotValueToPixel(plotPoint, 0);

1
Software/PC_Application/Traces/tracexyplot.h
View File

@ -65,7 +65,6 @@ private:
bool supported(Trace *t, YAxisType type); bool supported(Trace *t, YAxisType type);
void removeUnsupportedTraces(); void removeUnsupportedTraces();
QPointF traceToCoordinate(Trace *t, unsigned int sample, YAxisType type); QPointF traceToCoordinate(Trace *t, unsigned int sample, YAxisType type);
// QPoint dataToPixel(Trace::Data d);
QPoint plotValueToPixel(QPointF plotValue, int Yaxis); QPoint plotValueToPixel(QPointF plotValue, int Yaxis);
QPointF pixelToPlotValue(QPoint pixel, int YAxis); QPointF pixelToPlotValue(QPoint pixel, int YAxis);
QPoint markerToPixel(TraceMarker *m) override; QPoint markerToPixel(TraceMarker *m) override;