calibrated with fake Xconflicting_master

1 files changed, 9 insertions, 7 deletions

diff --git a/src/calibration.h b/src/calibration.h
index 4eee441..4876c17 100644
--- a/src/calibration.h
+++ b/src/calibration.h
@@ -14,7 +14,7 @@ using CalibrationTablePtr = QSharedPointer<CalibrationTable>;
 
 constexpr auto calibrationColumnHeight = std::tuple_size<CalibrationColumn>();
 
-bool openCalibrationTable(const QString &filename, CalibrationTablePtr &table);
+bool openCalibrationTable(const QString &filename, const CalibrationTablePtr table);
 
 // void dumpCalibrationPixels(std::vector<Pixels> &&calibrationPixels);
 enum class DumpFormat { Json, Binary };
@@ -22,19 +22,21 @@ void dumpCalibrationPixels(const std::vector<std::shared_ptr<Pixels> > &calibrat
                            const DumpFormat format = DumpFormat::Json);
 bool dump(const CalibrationTablePtr &table, const QString &filename);
 
+// TODO: implement median filter
 QList<Pixels> filter(const QList<Pixels> &rawProfiles);
 
-CalibrationTablePtr calibrateX(const QList<Pixels> &rawProfiles);
-CalibrationTablePtr calibrateZ(const QList<Pixels> &rawProfiles,
-                               const uint32_t &stepsPerMm);
+bool calibrateX(const QList<Pixels> &rawProfiles, CalibrationTablePtr table);
+bool calibrateZ(const QList<Pixels> &rawProfiles,
+                const uint32_t &stepsPerMm,
+                CalibrationTablePtr table);
 
 QImage calibrationTableToImage(const CalibrationTablePtr &calibrationTable);
 
-void interpolate(CalibrationTablePtr &table);
+void interpolate(const CalibrationTablePtr table);
 void interpolate(CalibrationColumn &column);
 
 // TODO: remove from this file
 namespace {
-static CalibrationTablePtr calibrationTableZ;
-static CalibrationTablePtr calibrationTableX;
+// static CalibrationTablePtr calibrationTableZ;
+// static CalibrationTablePtr calibrationTableX;
 } // namespace