diff --git a/source/backend.cpp b/source/backend.cpp
index dffc110..1b0931f 100644
--- a/source/backend.cpp
+++ b/source/backend.cpp
@@ -29,6 +29,7 @@
backEnd::backEnd(QObject *parent) :
QObject(parent),
+ m_versionNumber(""),
m_userConfigFileName(""),
m_userConfigOK(false),
behavTracker(nullptr)
diff --git a/source/backend.h b/source/backend.h
index 344fc8a..277fad6 100644
--- a/source/backend.h
+++ b/source/backend.h
@@ -22,6 +22,7 @@ class backEnd : public QObject
Q_PROPERTY(QString userConfigDisplay READ userConfigDisplay WRITE setUserConfigDisplay NOTIFY userConfigDisplayChanged)
Q_PROPERTY(bool userConfigOK READ userConfigOK WRITE setUserConfigOK NOTIFY userConfigOKChanged)
Q_PROPERTY(QString availableCodecList READ availableCodecList WRITE setAvailableCodecList NOTIFY availableCodecListChanged)
+ Q_PROPERTY(QString versionNumber READ versionNumber WRITE setVersionNumber NOTIFY versionNumberChanged)
public:
explicit backEnd(QObject *parent = nullptr);
@@ -37,6 +38,9 @@ class backEnd : public QObject
QString availableCodecList(){ return m_availableCodecList; }
void setAvailableCodecList(const QString &input);
+ QString versionNumber() { return m_versionNumber; }
+ void setVersionNumber(const QString &input) { m_versionNumber = input; }
+
void loadUserConfigFile();
bool checkUserConfigForIssues();
void constructUserConfigGUI();
@@ -52,6 +56,8 @@ class backEnd : public QObject
void userConfigDisplayChanged();
void userConfigOKChanged();
void availableCodecListChanged();
+ void versionNumberChanged();
+
void closeAll();
void showErrorMessage();
void showErrorMessageCompression();
@@ -70,6 +76,7 @@ public slots:
void testCodecSupport();
+ QString m_versionNumber;
QString m_userConfigFileName;
QString m_userConfigDisplay;
bool m_userConfigOK;
diff --git a/source/main.cpp b/source/main.cpp
index 91b3587..ab31406 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -9,6 +9,7 @@
#include "backend.h"
+#define VERSION_NUMBER "0.162"
// TODO: have exit button close everything
// For Window's deployment
@@ -40,6 +41,7 @@ int main(int argc, char *argv[])
engine.load(url);
+ backend.setVersionNumber(VERSION_NUMBER);
QObject::connect(&backend, &backEnd::closeAll, &engine, &QQmlApplicationEngine::quit);
return app.exec();
}
diff --git a/source/main.qml b/source/main.qml
index a574132..fafb1ae 100644
--- a/source/main.qml
+++ b/source/main.qml
@@ -42,7 +42,7 @@ Window {
anchors.fill: parent
TextArea {
- text: "Miniscope DAQ Software version 0.161
" +
+ text: "Miniscope DAQ Software version " + backend.versionNumber + "
" +
"Your OpenGL verions: " + OpenGLInfo.majorVersion + "." + OpenGLInfo.minorVersion + "
" +
"Developed by the Aharoni Lab, UCLA
" +
"Overview of the UCLA Miniscope project: click here
" +
diff --git a/userConfigs/UserConfigExample_V4_BNO_Miniscope.json b/userConfigs/UserConfigExample_V4_BNO_Miniscope.json
index c166891..a9d64b1 100644
--- a/userConfigs/UserConfigExample_V4_BNO_Miniscope.json
+++ b/userConfigs/UserConfigExample_V4_BNO_Miniscope.json
@@ -29,7 +29,7 @@
"deviceType": "Miniscope_V4_BNO",
"imageRegistration": "Off",
"streamHeadOrientation": true,
- "deviceID": 1,
+ "deviceID": 2,
"showSaturation": true,
"compressionOptions": ["MJPG","MJ2C","XVID","FFV1"],
"compression": "FFV1",
diff --git a/userConfigs/UserConfigExample_V4_BNO_Plus_BehavCam.json b/userConfigs/UserConfigExample_V4_BNO_Plus_BehavCam.json
index 8b00f18..1c0aa40 100644
--- a/userConfigs/UserConfigExample_V4_BNO_Plus_BehavCam.json
+++ b/userConfigs/UserConfigExample_V4_BNO_Plus_BehavCam.json
@@ -26,10 +26,10 @@
"miniscopes": [
{
"deviceName": "Miniscope 2",
- "deviceType": "Miniscope_V4_BNO",
+ "deviceType": "Miniscope_V4",
"imageRegistration": "Off",
"streamHeadOrientation": true,
- "deviceID": 1,
+ "deviceID": 2,
"showSaturation": true,
"compressionOptions": ["MJPG","MJ2C","XVID","FFV1"],
"compression": "FFV1",