fixed merge

This commit is contained in:
Erik Frojdh
2019-07-02 12:16:05 +02:00
7 changed files with 10 additions and 7 deletions

View File

@ -7,6 +7,7 @@
#include <QStandardItemModel>
#include <QTimer>
#include <cmath>
#include <iostream>
qTabMeasurement::qTabMeasurement(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot) : QWidget(parent), myDet(detector), myPlot(plot),