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

[WIP] build asyncopencv example

parent 5c0c180d
No related branches found
No related tags found
No related merge requests found
Showing
with 3158 additions and 873 deletions
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -9,9 +9,9 @@ common_flags : [ ...@@ -9,9 +9,9 @@ common_flags : [
// ... // ...
] ]
## update Qt.mk to own build of Qt5 ## upgrade to Qt5
add QtWidgets > Makefile: add QtWidgets to libs / cflags / dependencies
change Qt to Qt5 for pkgcfg modules > change Qt to Qt5 for pkgcfg modules
## add to .bashrc ## add to .bashrc
Qt_Path=/usr/local/Qt-5.15.0 Qt_Path=/usr/local/Qt-5.15.0
......
...@@ -17,7 +17,7 @@ all: $(BIN_PATH) ...@@ -17,7 +17,7 @@ all: $(BIN_PATH)
include $(MAKE_INCLUDE_DIR)/VimbaCPP.mk include $(MAKE_INCLUDE_DIR)/VimbaCPP.mk
include $(MAKE_INCLUDE_DIR)/VimbaImageTransform.mk include $(MAKE_INCLUDE_DIR)/VimbaImageTransform.mk
include $(MAKE_INCLUDE_DIR)/Qt.mk include $(MAKE_INCLUDE_DIR)/Qt5.mk
SOURCE_DIR = $(PROJECT_DIR)/Source SOURCE_DIR = $(PROJECT_DIR)/Source
...@@ -26,9 +26,9 @@ INCLUDE_DIRS = -I$(SOURCE_DIR) \ ...@@ -26,9 +26,9 @@ INCLUDE_DIRS = -I$(SOURCE_DIR) \
-I$(OBJ_DIR) -I$(OBJ_DIR)
OPENCV_CFLAGS = $(shell $(PKGCFG) --cflags opencv) OPENCV_CFLAGS = $(shell $(PKGCFG) --cflags opencv4)
OPENCV_LIBS = $(shell $(PKGCFG) --libs opencv) OPENCV_LIBS = $(shell $(PKGCFG) --libs opencv4)
...@@ -36,6 +36,7 @@ LIBS = $(VIMBACPP_LIBS) \ ...@@ -36,6 +36,7 @@ LIBS = $(VIMBACPP_LIBS) \
$(VIMBAIMAGETRANSFORM_LIBS) \ $(VIMBAIMAGETRANSFORM_LIBS) \
$(QTCORE_LIBS) \ $(QTCORE_LIBS) \
$(QTGUI_LIBS) \ $(QTGUI_LIBS) \
$(QTWIDGETS_LIBS) \
$(OPENCV_LIBS) $(OPENCV_LIBS)
DEFINES = DEFINES =
...@@ -46,6 +47,7 @@ CFLAGS = $(COMMON_CFLAGS) \ ...@@ -46,6 +47,7 @@ CFLAGS = $(COMMON_CFLAGS) \
$(VIMBAIMAGETRANSFORM_CFLAGS) \ $(VIMBAIMAGETRANSFORM_CFLAGS) \
$(QTCORE_CFLAGS) \ $(QTCORE_CFLAGS) \
$(QTGUI_CFLAGS) \ $(QTGUI_CFLAGS) \
$(QTWIDGETS_CFLAGS) \
$(OPENCV_CFLAGS) $(OPENCV_CFLAGS)
OBJ_FILES = $(OBJ_DIR)/ApiController.o \ OBJ_FILES = $(OBJ_DIR)/ApiController.o \
...@@ -64,7 +66,8 @@ GEN_HEADERS = $(OBJ_DIR)/ui_AsynchronousOpenCVRecorder.h ...@@ -64,7 +66,8 @@ GEN_HEADERS = $(OBJ_DIR)/ui_AsynchronousOpenCVRecorder.h
DEPENDENCIES = VimbaCPP \ DEPENDENCIES = VimbaCPP \
VimbaImageTransform \ VimbaImageTransform \
QtCore \ QtCore \
QtGui QtGui \
QtWidgets
$(OBJ_DIR)/moc_%.cpp: $(SOURCE_DIR)/%.h $(OBJ_DIR) $(OBJ_DIR)/moc_%.cpp: $(SOURCE_DIR)/%.h $(OBJ_DIR)
$(MOC) -o $@ $< $(MOC) -o $@ $<
...@@ -92,4 +95,4 @@ $(OBJ_DIR): ...@@ -92,4 +95,4 @@ $(OBJ_DIR):
$(MKDIR) -p $(OBJ_DIR) $(MKDIR) -p $(OBJ_DIR)
$(BIN_DIR): $(BIN_DIR):
$(MKDIR) -p $(BIN_DIR) $(MKDIR) -p $(BIN_DIR)
\ No newline at end of file
File added
File added
File added
File added
...@@ -87,8 +87,13 @@ the use of this software, even if advised of the possibility of such damage. ...@@ -87,8 +87,13 @@ the use of this software, even if advised of the possibility of such damage.
#include <algorithm> #include <algorithm>
#include <exception> #include <exception>
// allied vision image transform include // allied vision image transform include
#include "VmbTransform.h"
// VimbaImageTransform/Include/
// #include "VmbTransform.h"
// #include <VimbaCPP/Include/VimbaCPP.h>
// #include "VimbaCPP/Include/VimbaCPP.h"
#include <VimbaCPP/Include/VimbaCPP.h> #include <VimbaCPP/Include/VimbaCPP.h>
#include <VimbaImageTransform/Include/VmbTransform.h>
// //
......
...@@ -101,6 +101,19 @@ ...@@ -101,6 +101,19 @@
<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"/>
......
{ {
"folders": "folders":
[ [
{
"path": "Qt/Build/Make"
},
{ {
"path": "." "path": "."
},
{
"path": "../../.."
} }
] ]
} }
## use Qt5
replace Qt.mk with Qt5.mk in Makefile
> add qt5widgets?
> see async grab notes!
## use opencv4
apt install opencv-dev
pkg-config --cflags --libs opencv4 # test it!
# Makefile:
replace opencv with opencv4
OPENCV_CFLAGS = $(shell $(PKGCFG) --cflags opencv4)
OPENCV_LIBS = $(shell $(PKGCFG) --libs opencv4)
# add to ECC settings
"common_flags" : [
"-I/usr/include/opencv4",
// ...
]
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
typedef SP_DECL( AncillaryData ) AncillaryDataPtr; typedef SP_DECL( AncillaryData ) AncillaryDataPtr;
typedef SP_DECL( const AncillaryData ) ConstAncillaryDataPtr; typedef SP_DECL( const AncillaryData ) ConstAncillaryDataPtr;
class IFactory; // class IFactory;
class ICameraFactory;
typedef SP_DECL( ICameraFactory ) ICameraFactoryPtr; typedef SP_DECL( ICameraFactory ) ICameraFactoryPtr;
class ICameraListObserver; class ICameraListObserver;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment