Skip to content
Snippets Groups Projects
Commit d7ac1fec authored by am0ebe's avatar am0ebe
Browse files

give configfilename as arg, to quickly switch between setups

parent c3569302
No related branches found
No related tags found
No related merge requests found
......@@ -226,11 +226,11 @@ QString Cam::info()
try
{
std::string str;
g(_cam->GetID( str ));
_id = QString::fromStdString(str);
camInfo += _id + DELIM;
camInfo += name() + DELIM;
camInfo += ip() + DELIM;
camInfo += id() + DELIM;
std::string str;
// g(_cam->GetName( str ));
// _name = QString::fromStdString(str);
// camInfo += _name + DELIM;
......
......@@ -17,8 +17,13 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationVersion(getVersion());
QCoreApplication::setApplicationName("recorder");
//parse from arg
// configFile("cams23.json");
//parse from arg
QStringList arguments = a.arguments();
if (arguments.size()>=1)
{
configFile(arguments.at(1));
}
Controller controller;
Core core;
......
......@@ -43,7 +43,7 @@ void Core::init()
//parse config file
QList<QPair<QString, QString>> parsedCameras;
parseConfig(configFile(), parsedCameras);
parseConfig(parsedCameras);
//add to cam list
for ( auto cam : parsedCameras )
......@@ -74,7 +74,7 @@ void Core::detectCams()
CameraPtr pcam;
if( VmbErrorSuccess == _sys.GetCameraByID( cam->ip().toStdString(), VmbAccessModeFull, pcam ) )
{
cam->setCameraPtr(pcam); //triggers camobserver changed signal > set state closed
cam->setCameraPtr(pcam); //triggers camobserver changed signal > set state
}
}
}
......@@ -89,8 +89,6 @@ void Core::onCameraChanged(CameraPtr vcam, UpdateTriggerType type)
listCams();
}
// update + print camlist
void Core::listCams()
{
// qDebug() << __LINE__ << "-" << __PRETTY_FUNCTION__ << "";
......
......@@ -138,12 +138,12 @@ bool maybeCreateDir(QDir out_dir)
return true;
}
void parseConfig(const QString& filename, QList<QPair<QString,QString>>& parsedCameras)
void parseConfig(QList<QPair<QString,QString>>& parsedCameras)
{
QFile file(filename);
QFile file(configFile());
if (!file.open(QIODevice::ReadOnly))
{
qWarning() << "Failed to open file:" << filename;
qWarning() << "Failed to open file:" << configFile();
return;
}
......@@ -193,7 +193,14 @@ QString configFile(QString filename)
static QString _filename;
if( _filename.isEmpty() )
{
_filename = filename.isEmpty() ? QCoreApplication::applicationDirPath() + "/test.json" : filename;
if(filename.isEmpty())
{
_filename = QCoreApplication::applicationDirPath() + "/test.json" ;
}
else
{
_filename = filename;
}
}
return _filename;
}
......
......@@ -9,7 +9,7 @@
class QDir;
void parseConfig(const QString& filename, QList<QPair<QString,QString>>& parsedCameras);
void parseConfig(QList<QPair<QString,QString>>& parsedCameras);
QString configFile(QString filename="");
const QStringList getVersions();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment