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

use asterix/glob in .pro file

parent 7c3aa759
No related branches found
No related tags found
No related merge requests found
......@@ -3,22 +3,11 @@ TEMPLATE = app
QT += core
CONFIG += c++20 warn_on console
SOURCES += \
../src/cmd/main.cpp \
../src/cmd/console.cpp \
../src/core.cpp \
../src/frameobserver.cpp \
../src/frameprocessor.cpp \
../src/camobserver.cpp \
../src/utils.cpp
HEADERS += \
../src/cmd/console.h \
../src/core.h \
../src/frameobserver.h \
../src/frameprocessor.h \
../src/camobserver.h \
../src/utils.h
SRC_DIR=../src
SOURCES += $$SRC_DIR/cmd/*.cpp \
$$SRC_DIR/*.cpp
HEADERS += $$SRC_DIR/cmd/*.h \
$$SRC_DIR/*.h
DEFINES *= QT_USE_QSTRINGBUILDER #converts + to % when building strings
......@@ -40,7 +29,7 @@ QMAKE_CXXFLAGS += -Wno-deprecated-enum-enum-conversion # ignore opencv warnings.
# cp ../b/vimbax/api/lib/libVmb{C,CPP,ImageTransform}.so $${VIMBA_LIB_DIR}
TARGET = cmd
DESTDIR = ../bin
DEST_DIR = ../bin
QMAKE_CLEAN += .cache/clangd/index/* .qmake.stash $${DESTDIR}/*jpg
QMAKE_CLEAN += .cache/clangd/index/* .qmake.stash $${DEST_DIR}/*jpg
#cant rm dir here, so added in sublime-project file
......@@ -29,10 +29,9 @@ Core::Core() :
// frames(FramePtrVector(QThread::idealThreadCount())),
pixelFormat("")
{
QTimer::singleShot(0, this, SLOT(init())); //delayed init to allow connections to be established
QTimer::singleShot(0, this, SLOT(init())); //delayed init to allow connections to be established -> print/error signals!
}
void Core::init()
{
if ( f(sys.Startup(), "init API") )
......@@ -55,11 +54,6 @@ Core::~Core()
sys.Shutdown();
}
//2d
// need to update open / closed states.
//initially cams are closed, right? XXX how to find out?
//XXX track states
//VmbSystem::RegisterCameraListObserver
void Core::listCams()
{
if( !apiStarted )
......@@ -68,7 +62,7 @@ void Core::listCams()
if ( f(sys.GetCameras( cameras ), "get cameras") )
return;
qDebug().noquote() << QString("found %1 camera(s)").arg(cameras.size());
emitPrint( QString("found %1 camera(s)").arg(cameras.size()));
if (cameras.size())
{
if( camIdx == -1UL || camIdx >= cameras.size() )
......@@ -207,7 +201,6 @@ void Core::setCam(const int& newCamIdx)
Put frame into the frame queue
Start the acquisition engine ( curCam)
TODO use exceptions to not clutter error handling code here and catch em in main
TODO if( !curCam->isOpen() ) return; >> listener
2d get frameID
*/
......@@ -237,7 +230,7 @@ void Core::startRecording()
g( curCam->StartCapture(), "start capture");
for( auto frame : frames )
for( auto& frame : frames )
g( curCam->QueueFrame(frame),"QueueFrame");
g( curCam->GetFeatureByName ("AcquisitionStart", pFeature ),"get AcquisitionStart");
......
......@@ -7,12 +7,12 @@
#include <VmbCPP/Interface.h>
#include <VmbCPP/Camera.h>
namespace VmbCPP {
class VmbSystem;
}
namespace VmbCPP { class VmbSystem; }
using VmbCPP::VmbSystem;
using VmbCPP::CameraPtr;
using VmbCPP::FeaturePtr;
using VmbCPP::FramePtrVector;
using VmbCPP::CameraPtrVector;
class Core : public QObject
{
......@@ -50,8 +50,8 @@ class Core : public QObject
void getCamInfo( const CameraPtr & );
bool apiStarted;
VmbCPP::VmbSystem& sys;
VmbCPP::CameraPtrVector cameras;
VmbSystem& sys;
CameraPtrVector cameras;
ulong camIdx;
CameraPtr curCam;
......
......@@ -4,7 +4,6 @@
#include <VmbCPP/SharedPointerDefines.h>
#include <VmbCPP/Camera.h>
// #include "qnamespace.h"
#include <QDebug>
#include <QThread>
#include <QObject>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment