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

make recorder compilable again

parent a8dd1603
No related branches found
No related tags found
No related merge requests found
...@@ -101,19 +101,6 @@ ...@@ -101,19 +101,6 @@
<string>ColorProcessing</string> <string>ColorProcessing</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>520</x>
<y>540</y>
<width>89</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
</widget> </widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
......
...@@ -23,7 +23,7 @@ QT_WARNING_PUSH ...@@ -23,7 +23,7 @@ QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_MainWindow_t { struct qt_meta_stringdata_MainWindow_t {
const uint offsetsAndSize[8]; const uint offsetsAndSize[8];
char stringdata0[43]; char stringdata0[26];
}; };
#define QT_MOC_LITERAL(ofs, len) \ #define QT_MOC_LITERAL(ofs, len) \
uint(offsetof(qt_meta_stringdata_MainWindow_t, stringdata0) + ofs), len uint(offsetof(qt_meta_stringdata_MainWindow_t, stringdata0) + ofs), len
...@@ -32,10 +32,10 @@ static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { ...@@ -32,10 +32,10 @@ static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = {
QT_MOC_LITERAL(0, 10), // "MainWindow" QT_MOC_LITERAL(0, 10), // "MainWindow"
QT_MOC_LITERAL(11, 3), // "log" QT_MOC_LITERAL(11, 3), // "log"
QT_MOC_LITERAL(15, 0), // "" QT_MOC_LITERAL(15, 0), // ""
QT_MOC_LITERAL(16, 26) // "on_button_listcams_clicked" QT_MOC_LITERAL(16, 9) // "checkCams"
}, },
"MainWindow\0log\0\0on_button_listcams_clicked" "MainWindow\0log\0\0checkCams"
}; };
#undef QT_MOC_LITERAL #undef QT_MOC_LITERAL
...@@ -54,7 +54,7 @@ static const uint qt_meta_data_MainWindow[] = { ...@@ -54,7 +54,7 @@ static const uint qt_meta_data_MainWindow[] = {
// slots: name, argc, parameters, tag, flags, initial metatype offsets // slots: name, argc, parameters, tag, flags, initial metatype offsets
1, 1, 26, 2, 0x0a, 1 /* Public */, 1, 1, 26, 2, 0x0a, 1 /* Public */,
3, 0, 29, 2, 0x08, 3 /* Private */, 3, 0, 29, 2, 0x0a, 3 /* Public */,
// slots: parameters // slots: parameters
QMetaType::Void, QMetaType::QString, 2, QMetaType::Void, QMetaType::QString, 2,
...@@ -70,7 +70,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, ...@@ -70,7 +70,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
(void)_t; (void)_t;
switch (_id) { switch (_id) {
case 0: _t->log((*reinterpret_cast< std::add_pointer_t<QString>>(_a[1]))); break; case 0: _t->log((*reinterpret_cast< std::add_pointer_t<QString>>(_a[1]))); break;
case 1: _t->on_button_listcams_clicked(); break; case 1: _t->checkCams(); break;
default: ; default: ;
} }
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "../obj/ui_mainwindow.h" #include "../obj/ui_mainwindow.h"
#include <QDebug> #include <QDebug>
#include <QPushButton> // #include <QPushButton>
#include <unistd.h> #include <unistd.h>
#include <iostream> #include <iostream>
...@@ -14,22 +14,22 @@ using namespace AVT::VmbAPI; ...@@ -14,22 +14,22 @@ using namespace AVT::VmbAPI;
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
, ui(new Ui::MainWindow) , ui(new Ui::MainWindow)
, sys(VimbaSystem::GetInstance()) // Create and get Vimba singleton , sys(VimbaSystem::GetInstance()) // Create and get Vimba singleton
{ , cameras(CameraPtrVector())
{
ui->setupUi(this); ui->setupUi(this);
// QMetaObject::connectSlotsByName(this); //sseems to be done automagically QObject::connect(ui->b_update, SIGNAL(clicked()), this, SLOT(checkCams()));
// QObject::connect(&ui->button_listcams, &QPushButton::clicked(), list_cams);
log(getVersionString()); log(getVersionString());
if ( VmbErrorSuccess == sys.Startup() ) if ( VmbErrorSuccess == sys.Startup() )
{ {
log( " Started Vimba C++ Api" ); log( " Started Vimba C++ Api" );
checkCams();
} }
else else
{ {
log( " Failed to start Vimba C++ Api" ); log( " Failed to start Vimba C++ Api" );
} }
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
...@@ -45,14 +45,20 @@ MainWindow::~MainWindow() ...@@ -45,14 +45,20 @@ MainWindow::~MainWindow()
delete ui; delete ui;
} }
// void MainWindow::foo() // void MainWindow::open()
// { // {
// VimbaSystem::RegisterCameraListObserver // //open 1rst cam in list
// if ( VmbErrorSuccess == (* iter)->Open( VmbAccessModeFull ) )
// {
// std :: cout << " Camera opened " << std :: endl;
// }
// ID can be IP / MAC / ID
// sys->OpenCameraByID
// } // }
void MainWindow::on_button_listcams_clicked() // void MainWindow::on_b_listcams_clicked()
void MainWindow::checkCams()
{ {
CameraPtrVector cameras; // A vector of std::shared_ptr<AVT::VmbAPI::Camera> objects
VmbErrorType err = sys.GetCameras( cameras ); // Fetch all cameras known to Vimba VmbErrorType err = sys.GetCameras( cameras ); // Fetch all cameras known to Vimba
if( VmbErrorSuccess == err ) if( VmbErrorSuccess == err )
{ {
...@@ -100,12 +106,14 @@ void MainWindow::printCamInfo( const CameraPtr &camera ) ...@@ -100,12 +106,14 @@ void MainWindow::printCamInfo( const CameraPtr &camera )
"\n/// @ Interface ID : " + strInterfaceID + "\n\n"; "\n/// @ Interface ID : " + strInterfaceID + "\n\n";
log( QString::fromStdString(caminfo)); log( QString::fromStdString(caminfo));
// ui->lw_cams->
} }
void MainWindow::log(const QString& msg) void MainWindow::log(const QString& msg)
{ {
//for std::string, use: log(QString::fromStdString(msg)) //for std::string, use: log(QString::fromStdString(msg))
ui->logWidget->insertItem( 0, msg ); ui->lw_log->insertItem( 0, msg );
qDebug() << msg; qDebug() << msg;
} }
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
#define MAINWINDOW_H #define MAINWINDOW_H
#include <QMainWindow> #include <QMainWindow>
#include "VimbaCPP/Include/VimbaCPP.h" #include <VimbaCPP/Include/VimbaCPP.h>
#include <VimbaCPP/Include/SharedPointerDefines.h>
// #include <VimbaCPP/Include/Camera.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; } namespace Ui { class MainWindow; }
...@@ -10,6 +12,7 @@ QT_END_NAMESPACE ...@@ -10,6 +12,7 @@ QT_END_NAMESPACE
namespace AVT { namespace VmbAPI { class VimbaSystem; } } namespace AVT { namespace VmbAPI { class VimbaSystem; } }
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {
Q_OBJECT Q_OBJECT
...@@ -21,13 +24,14 @@ public: ...@@ -21,13 +24,14 @@ public:
public slots: public slots:
void log(const QString&); void log(const QString&);
private slots: // private slots:
void on_button_listcams_clicked(); void checkCams();
private: private:
void printCamInfo( const AVT::VmbAPI::CameraPtr &camera ); void printCamInfo( const AVT::VmbAPI::CameraPtr &camera );
Ui::MainWindow *ui; Ui::MainWindow *ui;
AVT::VmbAPI::VimbaSystem &sys; AVT::VmbAPI::VimbaSystem &sys;
AVT::VmbAPI::CameraPtrVector cameras;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H
...@@ -13,21 +13,7 @@ ...@@ -13,21 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget"/>
<widget class="QPushButton" name="button_listcams">
<property name="geometry">
<rect>
<x>61</x>
<y>260</y>
<width>89</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>list cams</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
...@@ -46,7 +32,26 @@ ...@@ -46,7 +32,26 @@
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QListWidget" name="logWidget"/> <widget class="QListWidget" name="lw_log"/>
</item>
</layout>
</widget>
</widget>
<widget class="QDockWidget" name="dockWidget_2">
<attribute name="dockWidgetArea">
<number>1</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents_2">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="b_update">
<property name="text">
<string>update</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="lw_cams"/>
</item> </item>
</layout> </layout>
</widget> </widget>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment