From 76dbeb7168c90a0cd061f0dbcde95f3724123e28 Mon Sep 17 00:00:00 2001 From: am0ebe <am0ebe@gmx.de> Date: Thu, 11 Jan 2024 15:16:22 +0100 Subject: [PATCH] gitignore data, fix path in project file --- .gitignore | 3 +- obj/Makefile | 14 ++-- obj/moc_mainwindow.cpp | 99 ++++++++++++++++++---------- obj/moc_predefs.h | 136 ++++++++++++++++++++++++--------------- obj/ui_mainwindow.h | 40 ++++++------ recorder.sublime-project | 10 +-- 6 files changed, 181 insertions(+), 121 deletions(-) diff --git a/.gitignore b/.gitignore index 566bd0c..a30574d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +data object binary bin @@ -10,4 +11,4 @@ recorder/obj/* *.qmake.stash __pycache__ -VimbaX_2023-1 +vimbax diff --git a/obj/Makefile b/obj/Makefile index 7656545..b09fe8b 100644 --- a/obj/Makefile +++ b/obj/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: ../bin/recorder -# Generated by qmake (3.1) (Qt 6.2.4) +# Generated by qmake (3.1) (Qt 6.4.2) # Project: recorder.pro # Template: app # Command: /usr/bin/qmake6 -o Makefile recorder.pro @@ -15,8 +15,8 @@ EQ = = CC = gcc CXX = g++ DEFINES = -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -O2 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -std=gnu++2a -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) +CFLAGS = -pipe -O2 -Wall -Wextra -fPIC -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -std=gnu++2a -Wall -Wextra -fPIC -D_REENTRANT $(DEFINES) INCPATH = -I. -I../vimbax/api/include -I/usr/include/opencv4 -I/usr/include/x86_64-linux-gnu/qt6 -I/usr/include/x86_64-linux-gnu/qt6/QtWidgets -I/usr/include/x86_64-linux-gnu/qt6/QtGui -I/usr/include/x86_64-linux-gnu/qt6/QtCore -I. -I. -I/usr/lib/x86_64-linux-gnu/qt6/mkspecs/linux-g++ QMAKE = /usr/bin/qmake6 DEL_FILE = rm -f @@ -40,7 +40,7 @@ DISTNAME = recorder1.0.0 DISTDIR = /home/sugu/code/idiv/camtron_all/b/obj/.tmp/recorder1.0.0 LINK = g++ LFLAGS = -Wl,-O1 -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu -LIBS = $(SUBLIBS) -L../lib -lVmbC -lVmbCPP -Wl,-rpath,'$$ORIGIN' -lopencv_stitching -lopencv_alphamat -lopencv_aruco -lopencv_barcode -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hdf -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_shape -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_ml -lopencv_videostab -lopencv_videoio -lopencv_viz -lopencv_wechat_qrcode -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core /usr/lib/x86_64-linux-gnu/libQt6Widgets.so /usr/lib/x86_64-linux-gnu/libQt6Gui.so /usr/lib/x86_64-linux-gnu/libGLX.so /usr/lib/x86_64-linux-gnu/libOpenGL.so /usr/lib/x86_64-linux-gnu/libQt6Core.so -lpthread -lGLX -lOpenGL +LIBS = $(SUBLIBS) -L../lib -lVmbC -lVmbCPP -Wl,-rpath,'$$ORIGIN' -lopencv_stitching -lopencv_alphamat -lopencv_aruco -lopencv_barcode -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_cvv -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hdf -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_shape -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_ml -lopencv_videostab -lopencv_videoio -lopencv_viz -lopencv_wechat_qrcode -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core /usr/lib/x86_64-linux-gnu/libQt6Widgets.so /usr/lib/x86_64-linux-gnu/libQt6Gui.so /usr/lib/x86_64-linux-gnu/libGLX.so /usr/lib/x86_64-linux-gnu/libOpenGL.so /usr/lib/x86_64-linux-gnu/libQt6Core.so -lpthread -lGLX -lOpenGL AR = ar cqs RANLIB = SED = sed @@ -140,7 +140,7 @@ first: all ../bin/recorder: ui_mainwindow.h $(OBJECTS) @test -d ../bin/ || mkdir -p ../bin/ - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) cp ../lib/lib*.so ../bin Makefile: recorder.pro /usr/lib/x86_64-linux-gnu/qt6/mkspecs/linux-g++/qmake.conf /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/spec_pre.prf \ @@ -331,7 +331,7 @@ compiler_moc_predefs_make_all: moc_predefs.h compiler_moc_predefs_clean: -$(DEL_FILE) moc_predefs.h moc_predefs.h: /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/data/dummy.cpp - g++ -pipe -O2 -std=gnu++2a -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/data/dummy.cpp + g++ -pipe -O2 -std=gnu++2a -Wall -Wextra -fPIC -dM -E -o moc_predefs.h /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/data/dummy.cpp compiler_moc_header_make_all: moc_mainwindow.cpp compiler_moc_header_clean: @@ -548,3 +548,5 @@ uninstall: FORCE FORCE: +.SUFFIXES: + diff --git a/obj/moc_mainwindow.cpp b/obj/moc_mainwindow.cpp index 871145e..43ca21d 100644 --- a/obj/moc_mainwindow.cpp +++ b/obj/moc_mainwindow.cpp @@ -1,50 +1,67 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mainwindow.h' ** -** Created by: The Qt Meta Object Compiler version 68 (Qt 6.2.4) +** Created by: The Qt Meta Object Compiler version 68 (Qt 6.4.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #include <memory> #include "../src/mainwindow.h" -#include <QtCore/qbytearray.h> #include <QtCore/qmetatype.h> #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mainwindow.h' doesn't include <QObject>." #elif Q_MOC_OUTPUT_REVISION != 68 -#error "This file was generated using the moc from 6.2.4. It" +#error "This file was generated using the moc from 6.4.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif +#ifndef Q_CONSTINIT +#define Q_CONSTINIT +#endif + QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED +namespace { struct qt_meta_stringdata_MainWindow_t { - const uint offsetsAndSize[16]; - char stringdata0[65]; + uint offsetsAndSizes[16]; + char stringdata0[11]; + char stringdata1[4]; + char stringdata2[1]; + char stringdata3[11]; + char stringdata4[4]; + char stringdata5[11]; + char stringdata6[13]; + char stringdata7[10]; }; #define QT_MOC_LITERAL(ofs, len) \ - uint(offsetof(qt_meta_stringdata_MainWindow_t, stringdata0) + ofs), len -static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { + uint(sizeof(qt_meta_stringdata_MainWindow_t::offsetsAndSizes) + ofs), len +Q_CONSTINIT static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { { -QT_MOC_LITERAL(0, 10), // "MainWindow" -QT_MOC_LITERAL(11, 3), // "log" -QT_MOC_LITERAL(15, 0), // "" -QT_MOC_LITERAL(16, 10), // "VmbError_t" -QT_MOC_LITERAL(27, 3), // "err" -QT_MOC_LITERAL(31, 10), // "updateCams" -QT_MOC_LITERAL(42, 12), // "openCloseCam" -QT_MOC_LITERAL(55, 9) // "selectCam" - + QT_MOC_LITERAL(0, 10), // "MainWindow" + QT_MOC_LITERAL(11, 3), // "log" + QT_MOC_LITERAL(15, 0), // "" + QT_MOC_LITERAL(16, 10), // "VmbError_t" + QT_MOC_LITERAL(27, 3), // "err" + QT_MOC_LITERAL(31, 10), // "updateCams" + QT_MOC_LITERAL(42, 12), // "openCloseCam" + QT_MOC_LITERAL(55, 9) // "selectCam" }, - "MainWindow\0log\0\0VmbError_t\0err\0" - "updateCams\0openCloseCam\0selectCam" + "MainWindow", + "log", + "", + "VmbError_t", + "err", + "updateCams", + "openCloseCam", + "selectCam" }; #undef QT_MOC_LITERAL +} // unnamed namespace -static const uint qt_meta_data_MainWindow[] = { +Q_CONSTINIT static const uint qt_meta_data_MainWindow[] = { // content: 10, // revision @@ -74,6 +91,34 @@ static const uint qt_meta_data_MainWindow[] = { 0 // eod }; +Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { + QMetaObject::SuperData::link<QMainWindow::staticMetaObject>(), + qt_meta_stringdata_MainWindow.offsetsAndSizes, + qt_meta_data_MainWindow, + qt_static_metacall, + nullptr, + qt_incomplete_metaTypeArray<qt_meta_stringdata_MainWindow_t, + // Q_OBJECT / Q_GADGET + QtPrivate::TypeAndForceComplete<MainWindow, std::true_type>, + // method 'log' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<QString, std::false_type>, + QtPrivate::TypeAndForceComplete<VmbError_t, std::false_type>, + // method 'log' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<QString, std::false_type>, + // method 'updateCams' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'openCloseCam' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'selectCam' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type> + >, + nullptr +} }; + void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { @@ -90,22 +135,6 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } } -const QMetaObject MainWindow::staticMetaObject = { { - QMetaObject::SuperData::link<QMainWindow::staticMetaObject>(), - qt_meta_stringdata_MainWindow.offsetsAndSize, - qt_meta_data_MainWindow, - qt_static_metacall, - nullptr, -qt_incomplete_metaTypeArray<qt_meta_stringdata_MainWindow_t -, QtPrivate::TypeAndForceComplete<MainWindow, std::true_type> -, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<QString, std::false_type>, QtPrivate::TypeAndForceComplete<VmbError_t, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<QString, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<int, std::false_type>, QtPrivate::TypeAndForceComplete<int, std::false_type> - - ->, - nullptr -} }; - - const QMetaObject *MainWindow::metaObject() const { return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; diff --git a/obj/moc_predefs.h b/obj/moc_predefs.h index 0145b5f..921526f 100644 --- a/obj/moc_predefs.h +++ b/obj/moc_predefs.h @@ -1,8 +1,7 @@ -#define __SSP_STRONG__ 3 #define __DBL_MIN_EXP__ (-1021) -#define __cpp_attributes 200809L #define __cpp_nontype_template_parameter_auto 201606L #define __UINT_LEAST16_MAX__ 0xffff +#define __FLT16_HAS_QUIET_NAN__ 1 #define __ATOMIC_ACQUIRE 2 #define __FLT128_MAX_10_EXP__ 4932 #define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F @@ -10,6 +9,7 @@ #define __cpp_aggregate_nsdmi 201304L #define __UINT_LEAST8_TYPE__ unsigned char #define __SIZEOF_FLOAT80__ 16 +#define __BFLT16_DENORM_MIN__ 9.18354961579912115600575419704879436e-41BF16 #define __cpp_impl_three_way_comparison 201907L #define __INTMAX_C(c) c ## L #define __CHAR_BIT__ 8 @@ -19,13 +19,11 @@ #define __WINT_MAX__ 0xffffffffU #define __FLT32_MIN_EXP__ (-125) #define __cpp_static_assert 201411L +#define __BFLT16_MIN_10_EXP__ (-37) #define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL #define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 #define __GCC_ATOMIC_CHAR_LOCK_FREE 2 #define __GCC_IEC_559 2 @@ -43,78 +41,85 @@ #define __FINITE_MATH_ONLY__ 0 #define __cpp_variable_templates 201304L #define __FLT32X_MAX_EXP__ 1024 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 #define __FLT32_HAS_DENORM__ 1 #define __UINT_FAST8_MAX__ 0xff #define __cpp_rvalue_reference 200610L #define __cpp_nested_namespace_definitions 201411L #define __DEC64_MAX_EXP__ 385 #define __INT8_C(c) c +#define __LDBL_HAS_INFINITY__ 1 #define __INT_LEAST8_WIDTH__ 8 #define __cpp_variadic_using 201611L #define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL #define __INT_LEAST8_MAX__ 0x7f +#define __cpp_attributes 200809L #define __cpp_capture_star_this 201603L #define __SHRT_MAX__ 0x7fff #define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L #define __cpp_impl_coroutine 201902L #define __FLT64X_MAX_10_EXP__ 4932 #define __cpp_if_constexpr 201606L -#define __LDBL_IS_IEC_60559__ 2 +#define __BFLT16_MAX_10_EXP__ 38 +#define __BFLT16_MAX_EXP__ 128 +#define __LDBL_IS_IEC_60559__ 1 #define __FLT64X_HAS_QUIET_NAN__ 1 #define __UINT_LEAST8_MAX__ 0xff #define __GCC_ATOMIC_BOOL_LOCK_FREE 2 #define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 #define __UINTMAX_TYPE__ long unsigned int +#define __cpp_nsdmi 200809L +#define __BFLT16_DECIMAL_DIG__ 4 #define __linux 1 #define __DEC32_EPSILON__ 1E-6DF #define __FLT_EVAL_METHOD_TS_18661_3__ 0 #define __OPTIMIZE__ 1 -#define __unix 1 #define __UINT32_MAX__ 0xffffffffU #define __GXX_EXPERIMENTAL_CXX0X__ 1 +#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) #define __FLT128_MIN_EXP__ (-16381) #define __WINT_MIN__ 0U #define __FLT128_MIN_10_EXP__ (-4931) -#define __FLT32X_IS_IEC_60559__ 2 +#define __FLT32X_IS_IEC_60559__ 1 #define __INT_LEAST16_WIDTH__ 16 #define __SCHAR_MAX__ 0x7f #define __FLT128_MANT_DIG__ 113 #define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) #define __INT64_C(c) c ## L +#define __SSP_STRONG__ 3 #define __cpp_impl_destroying_delete 201806L #define __GCC_ATOMIC_POINTER_LOCK_FREE 2 +#define __ATOMIC_SEQ_CST 5 #define _FORTIFY_SOURCE 2 +#define __unix 1 +#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL #define __FLT32X_MANT_DIG__ 53 #define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 #define __cpp_aligned_new 201606L -#define __USER_LABEL_PREFIX__ #define __FLT32_MAX_10_EXP__ 38 #define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x #define __STDC_HOSTED__ 1 #define __DEC64_MIN_EXP__ (-382) #define __cpp_decltype_auto 201304L #define __DBL_DIG__ 15 -#define __FLT32_DIG__ 6 #define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __cpp_char8_t 201811L +#define __cpp_char8_t 202207L #define __GXX_WEAK__ 1 #define __SHRT_WIDTH__ 16 -#define __FLT32_IS_IEC_60559__ 2 +#define __FLT32_IS_IEC_60559__ 1 #define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DBL_IS_IEC_60559__ 2 +#define __DBL_IS_IEC_60559__ 1 #define __DEC32_MAX__ 9.999999E96DF #define __CHAR8_TYPE__ unsigned char #define __cpp_threadsafe_static_init 200806L #define __cpp_enumerator_attributes 201411L #define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x #define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff #define __unix__ 1 #define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 #define __STDC_IEC_559__ 1 #define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c +#define __GCC_ATOMIC_CHAR8_T_LOCK_FREE 2 #define __DECIMAL_DIG__ 21 #define __STDC_IEC_559_COMPLEX__ 1 #define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 @@ -124,35 +129,39 @@ #define __cpp_using_enum 201907L #define __FLT64X_MIN_10_EXP__ (-4931) #define __LDBL_HAS_QUIET_NAN__ 1 +#define __cpp_return_type_deduction 201304L +#define __FLT16_MIN_EXP__ (-13) #define __FLT64_MANT_DIG__ 53 #define __cpp_consteval 201811L #define __FLT64X_MANT_DIG__ 64 -#define __GNUC__ 11 +#define __BFLT16_DIG__ 2 +#define __GNUC__ 13 #define __GXX_RTTI 1 -#define __pie__ 2 #define __MMX__ 1 #define __FLT_HAS_DENORM__ 1 #define __SIZEOF_LONG_DOUBLE__ 16 #define __BIGGEST_ALIGNMENT__ 16 #define __STDC_UTF_16__ 1 #define __FLT64_MAX_10_EXP__ 308 +#define __BFLT16_IS_IEC_60559__ 0 +#define __FLT16_MAX_10_EXP__ 4 #define __cpp_delegating_constructors 200604L -#define __FLT32_HAS_INFINITY__ 1 #define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) #define __cpp_raw_strings 200710L #define __INT_FAST32_MAX__ 0x7fffffffffffffffL #define __DBL_HAS_INFINITY__ 1 +#define __INT64_MAX__ 0x7fffffffffffffffL #define __SIZEOF_FLOAT__ 4 #define __HAVE_SPECULATION_SAFE_VALUE 1 #define __cpp_fold_expressions 201603L #define __DEC32_MIN_EXP__ (-94) #define __INTPTR_WIDTH__ 64 -#define __FLT64X_HAS_INFINITY__ 1 #define __UINT_LEAST32_MAX__ 0xffffffffU #define __FLT32X_HAS_DENORM__ 1 #define __INT_FAST16_TYPE__ long int #define __MMX_WITH_SSE__ 1 #define __LDBL_HAS_DENORM__ 1 +#define __SEG_GS 1 #define __cplusplus 202002L #define __cpp_ref_qualifiers 200710L #define __DEC32_MIN__ 1E-95DF @@ -162,52 +171,56 @@ #define __WCHAR_WIDTH__ 32 #define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 #define __DEC128_EPSILON__ 1E-33DL +#define __FLT16_DECIMAL_DIG__ 5 #define __SSE2_MATH__ 1 #define __ATOMIC_HLE_RELEASE 131072 #define __PTRDIFF_MAX__ 0x7fffffffffffffffL #define __amd64 1 #define __ATOMIC_HLE_ACQUIRE 65536 -#define __GNUG__ 11 +#define __GNUG__ 13 #define __LONG_LONG_MAX__ 0x7fffffffffffffffLL #define __SIZEOF_SIZE_T__ 8 -#define __cpp_nsdmi 200809L +#define __BFLT16_HAS_INFINITY__ 1 #define __FLT64X_MIN_EXP__ (-16381) #define __SIZEOF_WINT_T__ 4 +#define __FLT32X_DIG__ 15 #define __LONG_LONG_WIDTH__ 64 #define __cpp_initializer_lists 200806L #define __FLT32_MAX_EXP__ 128 #define __cpp_hex_float 201603L -#define __GXX_ABI_VERSION 1016 -#define __FLT128_HAS_INFINITY__ 1 +#define __GXX_ABI_VERSION 1018 #define __FLT_MIN_EXP__ (-125) #define __GCC_HAVE_DWARF2_CFI_ASM 1 #define __x86_64 1 #define __cpp_lambdas 200907L #define __INT_FAST64_TYPE__ long int +#define __BFLT16_MAX__ 3.38953138925153547590470800371487867e+38BF16 #define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 #define __cpp_template_auto 201606L -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) +#define __FLT16_DENORM_MIN__ 5.96046447753906250000000000000000000e-8F16 #define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 #define __FLT64X_NORM_MAX__ 1.18973149535723176502126385303097021e+4932F64x #define __SIZEOF_POINTER__ 8 +#define __SIZE_TYPE__ long unsigned int #define __LP64__ 1 #define __DBL_HAS_QUIET_NAN__ 1 #define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x +#define __LDBL_MAX_EXP__ 16384 #define __DECIMAL_BID_FORMAT__ 1 #define __FLT64_MIN_10_EXP__ (-307) +#define __FLT16_MIN_10_EXP__ (-4) #define __FLT64X_DECIMAL_DIG__ 21 #define __DEC128_MIN__ 1E-6143DL #define __REGISTER_PREFIX__ #define __UINT16_MAX__ 0xffff -#define __LDBL_HAS_INFINITY__ 1 +#define __FLT128_HAS_INFINITY__ 1 #define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 #define __UINT8_TYPE__ unsigned char #define __FLT_DIG__ 6 #define __DEC_EVAL_METHOD__ 2 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL #define __FLT_MANT_DIG__ 24 #define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "11.4.0" +#define __VERSION__ "13.2.0" #define __UINT64_C(c) c ## UL #define __cpp_unicode_characters 201411L #define _STDC_PREDEF_H 1 @@ -217,9 +230,11 @@ #define __cpp_conditional_explicit 201806L #define __FLT32_MANT_DIG__ 24 #define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __FLT32X_MIN_EXP__ (-1021) #define __cpp_aggregate_paren_init 201902L #define __STDC_IEC_60559_COMPLEX__ 201404L #define __cpp_aggregate_bases 201603L +#define __BFLT16_MIN__ 1.17549435082228750796873653722224568e-38BF16 #define __FLT128_HAS_DENORM__ 1 #define __FLT32_DECIMAL_DIG__ 9 #define __FLT128_DIG__ 33 @@ -227,15 +242,16 @@ #define __DEC64_EPSILON__ 1E-15DD #define __ORDER_PDP_ENDIAN__ 3412 #define __DEC128_MIN_EXP__ (-6142) +#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL #define __cpp_constinit 201907L #define __INT_FAST32_TYPE__ long int #define __UINT_LEAST16_TYPE__ short unsigned int +#define __DEC128_MAX_EXP__ 6145 #define unix 1 #define __DBL_HAS_DENORM__ 1 #define __cpp_rtti 199711L -#define __SIZE_TYPE__ long unsigned int #define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT_IS_IEC_60559__ 2 +#define __FLT_IS_IEC_60559__ 1 #define __GNUC_WIDE_EXECUTION_CHARSET_NAME "UTF-32LE" #define __FLT64X_DIG__ 18 #define __INT8_TYPE__ signed char @@ -243,26 +259,34 @@ #define __ELF__ 1 #define __GCC_ASM_FLAG_OUTPUTS__ 1 #define __UINT32_TYPE__ unsigned int +#define __BFLT16_HAS_QUIET_NAN__ 1 #define __FLT_RADIX__ 2 #define __INT_LEAST16_TYPE__ short int #define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L #define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 +#define __FLT16_DIG__ 3 #define __k8 1 #define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x #define __SIG_ATOMIC_MAX__ 0x7fffffff +#define __cpp_constexpr 202002L #define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 +#define __USER_LABEL_PREFIX__ #define __STDC_IEC_60559_BFP__ 201404L #define __SIZEOF_PTRDIFF_T__ 8 +#define __FLT64X_HAS_INFINITY__ 1 +#define __SIZEOF_LONG__ 8 #define __LDBL_DIG__ 18 -#define __FLT64_IS_IEC_60559__ 2 +#define __FLT64_IS_IEC_60559__ 1 #define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) +#define __FLT16_IS_IEC_60559__ 1 +#define __FLT16_MAX_EXP__ 16 #define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF #define __INT_FAST16_MAX__ 0x7fffffffffffffffL +#define __GCC_CONSTRUCTIVE_SIZE 64 #define __FLT64_DIG__ 15 #define __UINT_FAST32_MAX__ 0xffffffffffffffffUL #define __UINT_LEAST64_TYPE__ long unsigned int +#define __FLT16_EPSILON__ 9.76562500000000000000000000000000000e-4F16 #define __FLT_HAS_QUIET_NAN__ 1 #define __FLT_MAX_10_EXP__ 38 #define __LONG_MAX__ 0x7fffffffffffffffL @@ -279,17 +303,19 @@ #define __SIZE_WIDTH__ 64 #define __SEG_FS 1 #define __INT_LEAST16_MAX__ 0x7fff +#define __FLT16_NORM_MAX__ 6.55040000000000000000000000000000000e+4F16 #define __DEC64_MANT_DIG__ 16 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __SEG_GS 1 #define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 #define __SIG_ATOMIC_WIDTH__ 32 #define __INT_LEAST64_TYPE__ long int #define __INT16_TYPE__ short int #define __INT_LEAST8_TYPE__ signed char +#define __FLT16_MAX__ 6.55040000000000000000000000000000000e+4F16 +#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 #define __cpp_structured_bindings 201606L #define __SIZEOF_INT__ 4 #define __DEC32_MAX_EXP__ 97 +#define __BFLT16_EPSILON__ 7.81250000000000000000000000000000000e-3BF16 #define __INT_FAST8_MAX__ 0x7f #define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 #define __INTPTR_MAX__ 0x7fffffffffffffffL @@ -299,18 +325,20 @@ #define __FLT64_HAS_QUIET_NAN__ 1 #define __FLT32_MIN_10_EXP__ (-37) #define __EXCEPTIONS 1 +#define __UINT16_C(c) c #define __PTRDIFF_WIDTH__ 64 #define __LDBL_MANT_DIG__ 64 #define __cpp_range_based_for 201603L +#define __INT_FAST16_WIDTH__ 64 #define __FLT64_HAS_INFINITY__ 1 #define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x +#define __FLT16_HAS_INFINITY__ 1 #define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16 #define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) #define __code_model_small__ 1 #define __GCC_ATOMIC_LONG_LOCK_FREE 2 #define __cpp_nontype_template_args 201911L #define __DEC32_MANT_DIG__ 7 -#define __cpp_return_type_deduction 201304L #define __k8__ 1 #define __INTPTR_TYPE__ long int #define __UINT16_TYPE__ short unsigned int @@ -319,15 +347,17 @@ #define __UINTPTR_MAX__ 0xffffffffffffffffUL #define __INT_FAST64_WIDTH__ 64 #define __cpp_nontype_template_parameter_class 201806L -#define __cpp_concepts 201907L +#define __cpp_concepts 202002L #define __cpp_decltype 200707L #define __INT_FAST64_MAX__ 0x7fffffffffffffffL #define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 #define __FLT_NORM_MAX__ 3.40282346638528859811704183484516925e+38F +#define __FLT32_HAS_INFINITY__ 1 #define __FLT64X_MAX_EXP__ 16384 #define __UINT_FAST64_TYPE__ long unsigned int #define __cpp_constexpr_in_decltype 201711L #define __cpp_inline_variables 201606L +#define __BFLT16_MIN_EXP__ (-125) #define __INT_MAX__ 0x7fffffff #define __linux__ 1 #define __INT64_TYPE__ long int @@ -336,7 +366,7 @@ #define __DBL_MANT_DIG__ 53 #define __cpp_inheriting_constructors 201511L #define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL +#define __BFLT16_MANT_DIG__ 8 #define __DEC64_MIN__ 1E-383DD #define __WINT_TYPE__ unsigned int #define __UINT_LEAST32_TYPE__ unsigned int @@ -348,18 +378,18 @@ #define __amd64__ 1 #define __WINT_WIDTH__ 32 #define __INT_LEAST64_WIDTH__ 64 -#define __LDBL_MAX_EXP__ 16384 #define __FLT32X_MAX_10_EXP__ 308 +#define __cpp_namespace_attributes 201411L #define __SIZEOF_INT128__ 16 -#define __FLT64X_IS_IEC_60559__ 2 +#define __FLT16_MIN__ 6.10351562500000000000000000000000000e-5F16 +#define __FLT64X_IS_IEC_60559__ 1 #define __LDBL_MAX_10_EXP__ 4932 #define __ATOMIC_RELAXED 0 #define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 +#define __INT_LEAST32_TYPE__ int #define _LP64 1 #define __UINT8_C(c) c #define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int #define __SIZEOF_WCHAR_T__ 4 #define __GNUC_PATCHLEVEL__ 0 #define __FLT128_NORM_MAX__ 1.18973149535723176508575932662800702e+4932F128 @@ -367,12 +397,13 @@ #define __FLT128_HAS_QUIET_NAN__ 1 #define __INTMAX_MAX__ 0x7fffffffffffffffL #define __INT_FAST8_TYPE__ signed char -#define __cpp_namespace_attributes 201411L #define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x #define __STDCPP_THREADS__ 1 +#define __BFLT16_HAS_DENORM__ 1 #define __GNUC_STDC_INLINE__ 1 #define __FLT64_HAS_DENORM__ 1 #define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 +#define __FLT16_HAS_DENORM__ 1 #define __DBL_DECIMAL_DIG__ 17 #define __STDC_UTF_32__ 1 #define __INT_FAST8_WIDTH__ 8 @@ -380,24 +411,29 @@ #define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x #define __DBL_NORM_MAX__ double(1.79769313486231570814527423731704357e+308L) #define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __GCC_DESTRUCTIVE_SIZE 64 #define __INTMAX_WIDTH__ 64 #define __cpp_runtime_arrays 198712L +#define __FLT32_DIG__ 6 #define __UINT64_TYPE__ long unsigned int #define __UINT32_C(c) c ## U #define __cpp_alias_templates 200704L #define __cpp_constexpr_dynamic_alloc 201907L #define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __FLT128_IS_IEC_60559__ 2 +#define __FLT128_IS_IEC_60559__ 1 #define __INT8_MAX__ 0x7f #define __LONG_WIDTH__ 64 +#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) #define __PIC__ 2 +#define __INT32_MAX__ 0x7fffffff #define __UINT_FAST32_TYPE__ long unsigned int +#define __FLT16_MANT_DIG__ 11 #define __FLT32X_NORM_MAX__ 1.79769313486231570814527423731704357e+308F32x #define __CHAR32_TYPE__ unsigned int #define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 201907L #define __SSE2__ 1 #define __cpp_deduction_guides 201907L +#define __BFLT16_NORM_MAX__ 3.38953138925153547590470800371487867e+38BF16 #define __INT32_TYPE__ int #define __SIZEOF_DOUBLE__ 8 #define __cpp_exceptions 199711L @@ -405,24 +441,19 @@ #define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 #define __INT_LEAST32_WIDTH__ 32 #define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 +#define __GLIBCXX_BITSIZE_INT_N_0 128 #define __FLT32X_HAS_QUIET_NAN__ 1 #define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 4 +#define __GNUC_MINOR__ 2 #define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 #define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __PIE__ 2 #define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x #define __cpp_template_template_args 201611L #define __DBL_MAX_10_EXP__ 308 #define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __GCC_ATOMIC_CHAR8_T_LOCK_FREE 2 #define __INT16_C(c) c #define __STDC__ 1 -#define __FLT32X_DIG__ 15 #define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 #define __FLT32X_MIN_10_EXP__ (-307) #define __UINTPTR_TYPE__ long unsigned int #define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD @@ -439,6 +470,7 @@ #define __UINT_FAST16_MAX__ 0xffffffffffffffffUL #define __LDBL_NORM_MAX__ 1.18973149535723176502126385303097021e+4932L #define __GCC_ATOMIC_SHORT_LOCK_FREE 2 +#define __SIZE_MAX__ 0xffffffffffffffffUL #define __UINT_FAST8_TYPE__ unsigned char #define _GNU_SOURCE 1 #define __cpp_init_captures 201803L diff --git a/obj/ui_mainwindow.h b/obj/ui_mainwindow.h index 670947d..3de26e0 100644 --- a/obj/ui_mainwindow.h +++ b/obj/ui_mainwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'mainwindow.ui' ** -** Created by: Qt User Interface Compiler version 6.2.4 +** Created by: Qt User Interface Compiler version 6.4.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -50,51 +50,51 @@ public: void setupUi(QMainWindow *MainWindow) { if (MainWindow->objectName().isEmpty()) - MainWindow->setObjectName(QString::fromUtf8("MainWindow")); + MainWindow->setObjectName("MainWindow"); MainWindow->resize(984, 622); centralwidget = new QWidget(MainWindow); - centralwidget->setObjectName(QString::fromUtf8("centralwidget")); + centralwidget->setObjectName("centralwidget"); verticalLayout_3 = new QVBoxLayout(centralwidget); - verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + verticalLayout_3->setObjectName("verticalLayout_3"); l_vid = new QLabel(centralwidget); - l_vid->setObjectName(QString::fromUtf8("l_vid")); + l_vid->setObjectName("l_vid"); verticalLayout_3->addWidget(l_vid); MainWindow->setCentralWidget(centralwidget); menubar = new QMenuBar(MainWindow); - menubar->setObjectName(QString::fromUtf8("menubar")); + menubar->setObjectName("menubar"); menubar->setGeometry(QRect(0, 0, 984, 22)); MainWindow->setMenuBar(menubar); statusbar = new QStatusBar(MainWindow); - statusbar->setObjectName(QString::fromUtf8("statusbar")); + statusbar->setObjectName("statusbar"); MainWindow->setStatusBar(statusbar); dockWidget_down = new QDockWidget(MainWindow); - dockWidget_down->setObjectName(QString::fromUtf8("dockWidget_down")); + dockWidget_down->setObjectName("dockWidget_down"); dockWidgetContents = new QWidget(); - dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents")); + dockWidgetContents->setObjectName("dockWidgetContents"); verticalLayout = new QVBoxLayout(dockWidgetContents); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + verticalLayout->setObjectName("verticalLayout"); lw_log = new QListWidget(dockWidgetContents); - lw_log->setObjectName(QString::fromUtf8("lw_log")); + lw_log->setObjectName("lw_log"); verticalLayout->addWidget(lw_log); dockWidget_down->setWidget(dockWidgetContents); MainWindow->addDockWidget(Qt::BottomDockWidgetArea, dockWidget_down); dockWidget_left = new QDockWidget(MainWindow); - dockWidget_left->setObjectName(QString::fromUtf8("dockWidget_left")); + dockWidget_left->setObjectName("dockWidget_left"); dockWidgetContents_2 = new QWidget(); - dockWidgetContents_2->setObjectName(QString::fromUtf8("dockWidgetContents_2")); + dockWidgetContents_2->setObjectName("dockWidgetContents_2"); verticalLayout_2 = new QVBoxLayout(dockWidgetContents_2); - verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); + verticalLayout_2->setObjectName("verticalLayout_2"); b_update = new QPushButton(dockWidgetContents_2); - b_update->setObjectName(QString::fromUtf8("b_update")); + b_update->setObjectName("b_update"); verticalLayout_2->addWidget(b_update); tw_cams = new QTableWidget(dockWidgetContents_2); - tw_cams->setObjectName(QString::fromUtf8("tw_cams")); + tw_cams->setObjectName("tw_cams"); tw_cams->setSelectionBehavior(QAbstractItemView::SelectRows); tw_cams->setTextElideMode(Qt::ElideNone); tw_cams->horizontalHeader()->setVisible(true); @@ -106,13 +106,13 @@ public: dockWidget_left->setWidget(dockWidgetContents_2); MainWindow->addDockWidget(Qt::LeftDockWidgetArea, dockWidget_left); dockWidget_right = new QDockWidget(MainWindow); - dockWidget_right->setObjectName(QString::fromUtf8("dockWidget_right")); + dockWidget_right->setObjectName("dockWidget_right"); dockWidgetContents_3 = new QWidget(); - dockWidgetContents_3->setObjectName(QString::fromUtf8("dockWidgetContents_3")); + dockWidgetContents_3->setObjectName("dockWidgetContents_3"); verticalLayout_4 = new QVBoxLayout(dockWidgetContents_3); - verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4")); + verticalLayout_4->setObjectName("verticalLayout_4"); b_openclose = new QPushButton(dockWidgetContents_3); - b_openclose->setObjectName(QString::fromUtf8("b_openclose")); + b_openclose->setObjectName("b_openclose"); verticalLayout_4->addWidget(b_openclose); diff --git a/recorder.sublime-project b/recorder.sublime-project index bb71bec..a2ca5cc 100644 --- a/recorder.sublime-project +++ b/recorder.sublime-project @@ -2,8 +2,8 @@ "folders": [ { - "path": "../vimba", - "name": "vimba" + "path": "vimbax", + "name": "vimbaX" }, { "path": ".", @@ -11,11 +11,7 @@ { "path": "../dox", "name": "dox" - }, - { - "path": "~/dox/idiv/camtron", - "name": "dox 2" - }, + } ], "build_systems": [ -- GitLab