Commit 95d6f8ef authored by Thiago Santini's avatar Thiago Santini

Makes column headers private

parent 5f3ac22e
......@@ -35,11 +35,6 @@ public:
cv::Mat gazeEstimationVisualization;
bool showGazeEstimationVisualization;
static const QString TIMESTAMP;
static const QString LEFT_EYE_PREFIX;
static const QString RIGHT_EYE_PREFIX;
static const QString FIELD_PREFIX;
static QString header()
{
return journalField(TIMESTAMP) % FieldData().header(FIELD_PREFIX) % EyeData().header(LEFT_EYE_PREFIX) % EyeData().header(RIGHT_EYE_PREFIX);
......@@ -48,6 +43,12 @@ public:
{
return journalField(timestamp) % field.toQString() % lEye.toQString() % rEye.toQString();
}
private:
static const QString TIMESTAMP;
static const QString LEFT_EYE_PREFIX;
static const QString RIGHT_EYE_PREFIX;
static const QString FIELD_PREFIX;
};
#endif // DATATUPLE_H
......@@ -54,26 +54,6 @@ public:
cv::Rect coarseROI;
std::shared_ptr<CameraCalibration> cameraCalibration;
static const QString TIMESTAMP;
static const QString PUPIL_X;
static const QString PUPIL_Y;
static const QString PUPIL_WIDTH;
static const QString PUPIL_HEIGHT;
static const QString PUPIL_ANGLE;
static const QString PUPIL_CONFIDENCE;
static const QString GAZE_X;
static const QString GAZE_Y;
static const QString GAZE_Z;
static const QString INSTANTANEOUS_GAZE_X;
static const QString INSTANTANEOUS_GAZE_Y;
static const QString INSTANTANEOUS_GAZE_Z;
static const QString EYE_X;
static const QString EYE_Y;
static const QString EYE_Z;
static const QString EYE_CONFIDENCE;
static const QString VALID;
static const QString PROCESSING_TIME;
// TODO: header, toQString, and the reading from file (see the Calibration class) should be unified
// to avoid placing things in the wrong order / with the wrong string
QString header(QString prefix = "") const override
......@@ -122,6 +102,26 @@ private:
str.append(journalField(validPupil));
str.append(journalField(processingTimestamp));
}
static const QString TIMESTAMP;
static const QString PUPIL_X;
static const QString PUPIL_Y;
static const QString PUPIL_WIDTH;
static const QString PUPIL_HEIGHT;
static const QString PUPIL_ANGLE;
static const QString PUPIL_CONFIDENCE;
static const QString GAZE_X;
static const QString GAZE_Y;
static const QString GAZE_Z;
static const QString INSTANTANEOUS_GAZE_X;
static const QString INSTANTANEOUS_GAZE_Y;
static const QString INSTANTANEOUS_GAZE_Z;
static const QString EYE_X;
static const QString EYE_Y;
static const QString EYE_Z;
static const QString EYE_CONFIDENCE;
static const QString VALID;
static const QString PROCESSING_TIME;
};
Q_DECLARE_METATYPE(EyeData)
......
......@@ -51,22 +51,6 @@ public:
unsigned int height;
std::shared_ptr<CameraCalibration> cameraCalibration;
static const QString TIMESTAMP;
static const QString GAZE_X;
static const QString GAZE_Y;
static const QString GAZE_CONFIDENCE;
static const QString GAZE_VALID;
static const QString GAZE_META;
static const QString CM_ID;
static const QString CM_X;
static const QString CM_Y;
static const QString CM_Z;
static const QString UNDISTORTED;
static const QString WIDTH;
static const QString HEIGHT;
static const QString MARKERS;
static const QString PROCESSING_TIME;
QString header(QString prefix = "") const override
{
return prefix % journalField(TIMESTAMP)
......@@ -107,6 +91,22 @@ private:
str.append(Token::Delimiter);
str.append(journalField(processingTimestamp));
}
static const QString TIMESTAMP;
static const QString GAZE_X;
static const QString GAZE_Y;
static const QString GAZE_CONFIDENCE;
static const QString GAZE_VALID;
static const QString GAZE_META;
static const QString CM_ID;
static const QString CM_X;
static const QString CM_Y;
static const QString CM_Z;
static const QString UNDISTORTED;
static const QString WIDTH;
static const QString HEIGHT;
static const QString MARKERS;
static const QString PROCESSING_TIME;
};
Q_DECLARE_METATYPE(FieldData)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment