From f87df46941e1b7ab2aae3de2226fff491579b900 Mon Sep 17 00:00:00 2001 From: Kurt Kiefer Date: Wed, 14 Dec 2016 23:46:51 -0800 Subject: [PATCH] Organized project sources --- GetThermal.pro | 40 +++++++++--------- .../abstractccinterface.h | 0 dataformatter.h => inc/dataformatter.h | 0 leptonvariation.h => inc/leptonvariation.h | 0 .../leptonvariation_types.h | 0 rangeprovider.h => inc/rangeprovider.h | 0 uvcacquisition.h => inc/uvcacquisition.h | 0 uvcbuffer.h => inc/uvcbuffer.h | 0 uvcvideoproducer.h => inc/uvcvideoproducer.h | 0 AgcControls.qml => qml/AgcControls.qml | 0 LeptonControls.qml => qml/LeptonControls.qml | 0 PaletteModel.qml => qml/PaletteModel.qml | 0 RangeDisplay.qml => qml/RangeDisplay.qml | 3 +- ValueSlider.qml => qml/ValueSlider.qml | 0 VidControls.qml => qml/VidControls.qml | 0 Viewer.qml => qml/Viewer.qml | 0 ViewerForm.ui.qml => qml/ViewerForm.ui.qml | 3 ++ {images => qml/images}/brand-logo.png | Bin main.qml => qml/main.qml | 0 qml.qrc => qml/qml.qrc | 0 .../qtquickcontrols2.conf | 0 .../abstractccinterface.cpp | 0 dataformatter.cpp => src/dataformatter.cpp | 0 .../leptonvariation.cpp | 0 main.cpp => src/main.cpp | 0 rangeprovider.cpp => src/rangeprovider.cpp | 0 uvcacquisition.cpp => src/uvcacquisition.cpp | 0 uvcbuffer.cpp => src/uvcbuffer.cpp | 0 .../uvcvideoproducer.cpp | 0 29 files changed, 26 insertions(+), 20 deletions(-) rename abstractccinterface.h => inc/abstractccinterface.h (100%) rename dataformatter.h => inc/dataformatter.h (100%) rename leptonvariation.h => inc/leptonvariation.h (100%) rename leptonvariation_types.h => inc/leptonvariation_types.h (100%) rename rangeprovider.h => inc/rangeprovider.h (100%) rename uvcacquisition.h => inc/uvcacquisition.h (100%) rename uvcbuffer.h => inc/uvcbuffer.h (100%) rename uvcvideoproducer.h => inc/uvcvideoproducer.h (100%) rename AgcControls.qml => qml/AgcControls.qml (100%) rename LeptonControls.qml => qml/LeptonControls.qml (100%) rename PaletteModel.qml => qml/PaletteModel.qml (100%) rename RangeDisplay.qml => qml/RangeDisplay.qml (99%) rename ValueSlider.qml => qml/ValueSlider.qml (100%) rename VidControls.qml => qml/VidControls.qml (100%) rename Viewer.qml => qml/Viewer.qml (100%) rename ViewerForm.ui.qml => qml/ViewerForm.ui.qml (99%) rename {images => qml/images}/brand-logo.png (100%) rename main.qml => qml/main.qml (100%) rename qml.qrc => qml/qml.qrc (100%) rename qtquickcontrols2.conf => qml/qtquickcontrols2.conf (100%) rename abstractccinterface.cpp => src/abstractccinterface.cpp (100%) rename dataformatter.cpp => src/dataformatter.cpp (100%) rename leptonvariation.cpp => src/leptonvariation.cpp (100%) rename main.cpp => src/main.cpp (100%) rename rangeprovider.cpp => src/rangeprovider.cpp (100%) rename uvcacquisition.cpp => src/uvcacquisition.cpp (100%) rename uvcbuffer.cpp => src/uvcbuffer.cpp (100%) rename uvcvideoproducer.cpp => src/uvcvideoproducer.cpp (100%) diff --git a/GetThermal.pro b/GetThermal.pro index d765be1..7dceee2 100644 --- a/GetThermal.pro +++ b/GetThermal.pro @@ -4,12 +4,13 @@ QT_CONFIG -= no-pkg-config CONFIG += c++11 \ link_pkgconfig -SOURCES += main.cpp \ - uvcvideoproducer.cpp \ - uvcacquisition.cpp \ - uvcbuffer.cpp \ - leptonvariation.cpp \ - abstractccinterface.cpp \ +SOURCES += \ + src/main.cpp \ + src/uvcvideoproducer.cpp \ + src/uvcacquisition.cpp \ + src/uvcbuffer.cpp \ + src/leptonvariation.cpp \ + src/abstractccinterface.cpp \ lepton_sdk/Src/LEPTON_AGC.c \ lepton_sdk/Src/LEPTON_OEM.c \ lepton_sdk/Src/LEPTON_RAD.c \ @@ -17,10 +18,10 @@ SOURCES += main.cpp \ lepton_sdk/Src/LEPTON_SYS.c \ lepton_sdk/Src/LEPTON_VID.c \ lepton_sdk/Src/crc16fast.c \ - dataformatter.cpp \ - rangeprovider.cpp + src/dataformatter.cpp \ + src/rangeprovider.cpp -RESOURCES += qml.qrc +RESOURCES += qml/qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -29,11 +30,11 @@ QML_IMPORT_PATH = include(deployment.pri) HEADERS += \ - uvcvideoproducer.h \ - uvcbuffer.h \ - uvcacquisition.h \ - leptonvariation.h \ - abstractccinterface.h \ + inc/uvcvideoproducer.h \ + inc/uvcbuffer.h \ + inc/uvcacquisition.h \ + inc/leptonvariation.h \ + inc/abstractccinterface.h \ lepton_sdk/Inc/LEPTON_AGC.h \ lepton_sdk/Inc/LEPTON_ErrorCodes.h \ lepton_sdk/Inc/LEPTON_Macros.h \ @@ -46,12 +47,12 @@ HEADERS += \ lepton_sdk/Inc/LEPTON_VID.h \ lepton_sdk/Inc/crc16.h \ lepton_sdk/Inc/uvc_sdk.h \ - leptonvariation_types.h \ - dataformatter.h \ - rangeprovider.h + inc/leptonvariation_types.h \ + inc/dataformatter.h \ + inc/rangeprovider.h DISTFILES += \ - qtquickcontrols2.conf + qml/qtquickcontrols2.conf PKGCONFIG += libusb-1.0 opencv @@ -63,7 +64,8 @@ else:unix: LIBS += -L$$PWD/libuvc/build/ -luvc INCLUDEPATH += $$PWD/lepton_sdk/Inc \ $$PWD/libuvc/build/include \ - $$PWD/libuvc/include + $$PWD/libuvc/include \ + $$PWD/inc DEPENDPATH += $$PWD/libuvc/build/include \ $$PWD/libuvc/include diff --git a/abstractccinterface.h b/inc/abstractccinterface.h similarity index 100% rename from abstractccinterface.h rename to inc/abstractccinterface.h diff --git a/dataformatter.h b/inc/dataformatter.h similarity index 100% rename from dataformatter.h rename to inc/dataformatter.h diff --git a/leptonvariation.h b/inc/leptonvariation.h similarity index 100% rename from leptonvariation.h rename to inc/leptonvariation.h diff --git a/leptonvariation_types.h b/inc/leptonvariation_types.h similarity index 100% rename from leptonvariation_types.h rename to inc/leptonvariation_types.h diff --git a/rangeprovider.h b/inc/rangeprovider.h similarity index 100% rename from rangeprovider.h rename to inc/rangeprovider.h diff --git a/uvcacquisition.h b/inc/uvcacquisition.h similarity index 100% rename from uvcacquisition.h rename to inc/uvcacquisition.h diff --git a/uvcbuffer.h b/inc/uvcbuffer.h similarity index 100% rename from uvcbuffer.h rename to inc/uvcbuffer.h diff --git a/uvcvideoproducer.h b/inc/uvcvideoproducer.h similarity index 100% rename from uvcvideoproducer.h rename to inc/uvcvideoproducer.h diff --git a/AgcControls.qml b/qml/AgcControls.qml similarity index 100% rename from AgcControls.qml rename to qml/AgcControls.qml diff --git a/LeptonControls.qml b/qml/LeptonControls.qml similarity index 100% rename from LeptonControls.qml rename to qml/LeptonControls.qml diff --git a/PaletteModel.qml b/qml/PaletteModel.qml similarity index 100% rename from PaletteModel.qml rename to qml/PaletteModel.qml diff --git a/RangeDisplay.qml b/qml/RangeDisplay.qml similarity index 99% rename from RangeDisplay.qml rename to qml/RangeDisplay.qml index 1280075..48e81cf 100644 --- a/RangeDisplay.qml +++ b/qml/RangeDisplay.qml @@ -79,6 +79,7 @@ Item { MouseArea { anchors.fill: parent onClicked: farenheitTemps = !farenheitTemps - } + } } + } diff --git a/ValueSlider.qml b/qml/ValueSlider.qml similarity index 100% rename from ValueSlider.qml rename to qml/ValueSlider.qml diff --git a/VidControls.qml b/qml/VidControls.qml similarity index 100% rename from VidControls.qml rename to qml/VidControls.qml diff --git a/Viewer.qml b/qml/Viewer.qml similarity index 100% rename from Viewer.qml rename to qml/Viewer.qml diff --git a/ViewerForm.ui.qml b/qml/ViewerForm.ui.qml similarity index 99% rename from ViewerForm.ui.qml rename to qml/ViewerForm.ui.qml index e36c358..d4cf639 100644 --- a/ViewerForm.ui.qml +++ b/qml/ViewerForm.ui.qml @@ -127,6 +127,8 @@ Item { } + + Pane { width: 130 Layout.minimumWidth: 130 @@ -138,6 +140,7 @@ Item { acq: acq } } + } } diff --git a/images/brand-logo.png b/qml/images/brand-logo.png similarity index 100% rename from images/brand-logo.png rename to qml/images/brand-logo.png diff --git a/main.qml b/qml/main.qml similarity index 100% rename from main.qml rename to qml/main.qml diff --git a/qml.qrc b/qml/qml.qrc similarity index 100% rename from qml.qrc rename to qml/qml.qrc diff --git a/qtquickcontrols2.conf b/qml/qtquickcontrols2.conf similarity index 100% rename from qtquickcontrols2.conf rename to qml/qtquickcontrols2.conf diff --git a/abstractccinterface.cpp b/src/abstractccinterface.cpp similarity index 100% rename from abstractccinterface.cpp rename to src/abstractccinterface.cpp diff --git a/dataformatter.cpp b/src/dataformatter.cpp similarity index 100% rename from dataformatter.cpp rename to src/dataformatter.cpp diff --git a/leptonvariation.cpp b/src/leptonvariation.cpp similarity index 100% rename from leptonvariation.cpp rename to src/leptonvariation.cpp diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/rangeprovider.cpp b/src/rangeprovider.cpp similarity index 100% rename from rangeprovider.cpp rename to src/rangeprovider.cpp diff --git a/uvcacquisition.cpp b/src/uvcacquisition.cpp similarity index 100% rename from uvcacquisition.cpp rename to src/uvcacquisition.cpp diff --git a/uvcbuffer.cpp b/src/uvcbuffer.cpp similarity index 100% rename from uvcbuffer.cpp rename to src/uvcbuffer.cpp diff --git a/uvcvideoproducer.cpp b/src/uvcvideoproducer.cpp similarity index 100% rename from uvcvideoproducer.cpp rename to src/uvcvideoproducer.cpp