add showInfo func if user presses 'i', add warning() to iprinter/console/utils::error

src/cmd/console.cpp

@@ -62,11 +62,17 @@ void Console::error(const int& errCode )
 void Console::error(const QString& str, const int& errCode=0 )
 {
 	if( str != "" )
-		qDebug().noquote() << "⚠️ " << str;
+		qDebug().noquote() << "💣 " << str;
 	error(errCode);
 
 }
 
+void Console::warning(const QString& str )
+{
+	if( str != "" )
+		qDebug().noquote() << "⚠️ " << str;
+}
+
 void Console::print(const QString& str )
 {
 	qDebug().noquote() << str;
@@ -102,6 +108,7 @@ void Console::printHelp()
 	<< "r: start recording"
 	<< "t: stop recording"
 	<< "s: show recording stats"
+	<< "i: show info"
 	<< "l: list available cameras"
 	<< "k: deteKt cameras"
 	<< "y: load cam settings ("+ utils::settingsFile()+")"
@@ -181,6 +188,10 @@ void Controller::onKeyPressed(const QChar& key)
 			emit showRecordingStats();
 			break;
 
+		case 'i':
+			emit showInfo();
+			break;
+
 		case 'y':
 			emit loadSettings();
 			break;

src/cmd/console.h

@@ -25,6 +25,7 @@ public slots:
 
 	void error(const QString&,const int&);
 	void error(const int&);
+	void warning(const QString&);
 	void print(const QString&);
 	void print(const QStringList&);
 
@@ -66,6 +67,7 @@ class Controller : public QObject
 		void startRecording();
 		void stopRecording();
 		void showRecordingStats();
+		void showInfo();
 		void setDuration(int);
 		void loadSettings();
 		void saveSettings();

src/cmd/main.cpp

@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	QObject::connect(&controller, &Controller::startRecording, 	&core, &Core::startRecording);
 	QObject::connect(&controller, &Controller::stopRecording,	&core, &Core::stopRecording);
 	QObject::connect(&controller, &Controller::showRecordingStats,	&core, &Core::showRecordingStats);
+	QObject::connect(&controller, &Controller::showInfo, 		&core, &Core::showInfo);
 	QObject::connect(&controller, &Controller::loadSettings, 	&core, &Core::loadSettings);
 	QObject::connect(&controller, &Controller::saveSettings, 	&core, &Core::saveSettings);
 	// XXX add new func

src/core.cpp

@@ -181,6 +181,28 @@ void Core::showRecordingStats()
 		cam()->rec()->showStats();
 }
 
+void Core::showInfo()
+{
+	// if( cam() )
+		// cam()->showInfo();
+	print("---------(( INFO ))------------");
+	print("configFile",utils::configFile());
+	print("settingsFile",utils::settingsFile());
+	print("outDir",utils::outDir());
+	print("recDuration",utils::recDuration());
+	print("frameSize",utils::frameSize());
+	print("fps",utils::fps());
+	print("threadsPerCam",utils::threadsPerCam());
+	print("ncam",utils::ncam());
+	print("-------------------------------");
+
+	//listCams
+	//showStats
+	//checkDiskSpace (show progressbar)
+	//	calcDirSize, checkDirExists,
+
+}
+
 void Core::loadSettings()
 {
 	if( cam() )

src/core.h

@@ -29,13 +29,12 @@ public slots:
 	void closeCam();
 	void loadSettings();
 	void saveSettings();
-	// XXX add new func
-
 	CamPtr cam(const unsigned long &idx=-1);
-
 	void startRecording();
 	void stopRecording();
 	void showRecordingStats();
+	void showInfo();
+	// XXX add new func
 
 private slots:
 	void init();

src/iprinter.cpp

@@ -16,6 +16,7 @@ IPrinter::IPrinter(QObject *parent) : QObject(parent)
 #ifdef CONSOLE //defined in .pro
 	//vmb (core, cam) -> ui (controller.console)
 	Console* console = Console::getInstance();
+	connect(this, SIGNAL(warning(const QString&)), console, SLOT(warning(const QString&)), Qt::DirectConnection);
 	connect(this, SIGNAL(error(const QString&, const int&)), console, SLOT(error(const QString&, const int&)), Qt::DirectConnection);
 	connect(this, SIGNAL(error(const int&)), console, SLOT(error(const int&)), Qt::DirectConnection);
 	connect(this, SIGNAL(info(const QString&)), console, SLOT(print(const QString&)), Qt::DirectConnection);
@@ -106,6 +107,11 @@ void IPrinter::print(const char* name, const QString& val)
 	emit info(QString::fromLocal8Bit(name) + ": " + val);
 }
 
+void IPrinter::print(const char* name, const seconds& val)
+{
+	emit info(QString::fromLocal8Bit(name) + ": " + QString::number(val.count()) + "s");
+}
+
 QString IPrinter::progressBar(QTimer* timer)
 {
 	int total_ms = timer->interval();

src/iprinter.h

 #pragma once
 
 #include "VmbC/VmbCommonTypes.h"
+#include "typeDefinitions.h"
 
-#include <QObject>
-#include <QString>
 #include <QStringList>
 
 class QTimer;
@@ -16,6 +15,7 @@ class IPrinter : public QObject
 signals:
 	void info(const QString &);
 	void info(const QStringList&);
+	void warning(const QString&);
 	void error(const int&);
 	void error(const QString&,const int& errCode=0);
 
@@ -37,6 +37,7 @@ public:
 	void print(const char*);
 	void print(const char*, const VmbInt64_t&);
 	void print(const char*, const QString&);
+	void print(const char*, const seconds&);
 
 
 	QString progressBar(QTimer*);

src/record.cpp

@@ -199,7 +199,7 @@ void Record::checkDiskSpace(const QString &dir, seconds dur)
 
 	// Check if estimated recording space exceeds available space
 	if (estimated > available) {
-		qWarning() << "Warning: Estimated recording space exceeds available space!";
+		warning("Estimated recording space exceeds available space!)");
 	}
 }
 

src/utils.cpp

@@ -111,7 +111,7 @@ const QStringList getVersions()
 
 const QString errorCodeToMessage( VmbError_t err )
 {
-	QString msg = "⚠️  ";
+	QString msg = "💣 ";
 	switch( err )
 	{
 		default:                        msg += "Unknown"; break;
@@ -136,6 +136,7 @@ const QString errorCodeToMessage( VmbError_t err )
 		case VmbErrorNotImplemented:    msg += "Not implemented."; break;
 		case VmbErrorNotSupported:      msg += "Not supported."; break;
 			// ------------------------------- own errCodes -------------------------------
+		case errWarning:                msg = "⚠️ "; break;
 		case errCamIdx:                 msg += "Camera index out of range."; break;
 		case errNoCams:                 msg += "no cameras found."; break;
 		case errRegisterCamObserver:    msg += "cant register camobserver."; break;

src/utils.h

@@ -2,7 +2,6 @@
 #define UTILS_H
 
 #include "typeDefinitions.h"
-// #include "VmbC/VmbCommonTypes.h" //VmbError_t -> cant really fwd-decl typedef...??
 
 #include <atomic>
 
@@ -22,11 +21,11 @@ seconds recDuration(seconds=0s);
 qint64 frameSize(qint64 frameSize=0);
 int fps(int fps=0);
 
-extern std::atomic<bool> running; //global flag to ensure proper exit of threads
 int threadsPerCam();
 int ncam(const int& n=0);
 
 const QChar DELIM='|';
+extern std::atomic<bool> running; //global flag to ensure proper exit of threads
 
 
 //FUNCTIONS
@@ -42,13 +41,15 @@ const QString getVersion();
 const QString errorCodeToMessage( VmbError_t );
 
 
+//ENUMS
 typedef enum camtronErr
 {
-	errCamIdx	=	10,		//!< camera index out of range
-	errNoCams	=	11,		//!< no cameras found
-	errRegisterCamObserver	=	12,		//!< cant register camobserver
-	errLessCamsThanExpected	=	13,		//!< no cameras found
-	errRecordInvalid = 14, //!< record invalid
+	errWarning = 100,			//!< warning
+	errCamIdx,					//!< camera index out of range
+	errNoCams,					//!< no cameras found
+	errRegisterCamObserver,		//!< cant register camobserver
+	errLessCamsThanExpected,	//!< no cameras found
+	errRecordInvalid, 			//!< record invalid
 } camtronErr;
 
 } //namespace utils