Organized project sources

groupgets · Dec 15, 2016 · f87df46 · f87df46
1 parent ead2182
commit f87df46
Show file tree

Hide file tree

Showing 29 changed files with 26 additions and 20 deletions.
diff --git a/GetThermal.pro b/GetThermal.pro
@@ -4,23 +4,24 @@ 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 \
     lepton_sdk/Src/LEPTON_SDK.c \
     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 → inc/abstractccinterface.h b/abstractccinterface.h → inc/abstractccinterface.h
diff --git a/dataformatter.h → inc/dataformatter.h b/dataformatter.h → inc/dataformatter.h
diff --git a/leptonvariation.h → inc/leptonvariation.h b/leptonvariation.h → inc/leptonvariation.h
diff --git a/leptonvariation_types.h → inc/leptonvariation_types.h b/leptonvariation_types.h → inc/leptonvariation_types.h
diff --git a/rangeprovider.h → inc/rangeprovider.h b/rangeprovider.h → inc/rangeprovider.h
diff --git a/uvcacquisition.h → inc/uvcacquisition.h b/uvcacquisition.h → inc/uvcacquisition.h
diff --git a/uvcbuffer.h → inc/uvcbuffer.h b/uvcbuffer.h → inc/uvcbuffer.h
diff --git a/uvcvideoproducer.h → inc/uvcvideoproducer.h b/uvcvideoproducer.h → inc/uvcvideoproducer.h
diff --git a/AgcControls.qml → qml/AgcControls.qml b/AgcControls.qml → qml/AgcControls.qml
diff --git a/LeptonControls.qml → qml/LeptonControls.qml b/LeptonControls.qml → qml/LeptonControls.qml
diff --git a/PaletteModel.qml → qml/PaletteModel.qml b/PaletteModel.qml → qml/PaletteModel.qml
diff --git a/RangeDisplay.qml → qml/RangeDisplay.qml b/RangeDisplay.qml → qml/RangeDisplay.qml
@@ -79,6 +79,7 @@ Item {
         MouseArea {
             anchors.fill: parent
             onClicked: farenheitTemps = !farenheitTemps
-       }
+        }
     }
+
 }
diff --git a/ValueSlider.qml → qml/ValueSlider.qml b/ValueSlider.qml → qml/ValueSlider.qml
diff --git a/VidControls.qml → qml/VidControls.qml b/VidControls.qml → qml/VidControls.qml
diff --git a/Viewer.qml → qml/Viewer.qml b/Viewer.qml → qml/Viewer.qml
diff --git a/ViewerForm.ui.qml → qml/ViewerForm.ui.qml b/ViewerForm.ui.qml → 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 → qml/images/brand-logo.png b/images/brand-logo.png → qml/images/brand-logo.png
diff --git a/main.qml → qml/main.qml b/main.qml → qml/main.qml
diff --git a/qml.qrc → qml/qml.qrc b/qml.qrc → qml/qml.qrc
diff --git a/qtquickcontrols2.conf → qml/qtquickcontrols2.conf b/qtquickcontrols2.conf → qml/qtquickcontrols2.conf
diff --git a/abstractccinterface.cpp → src/abstractccinterface.cpp b/abstractccinterface.cpp → src/abstractccinterface.cpp
diff --git a/dataformatter.cpp → src/dataformatter.cpp b/dataformatter.cpp → src/dataformatter.cpp
diff --git a/leptonvariation.cpp → src/leptonvariation.cpp b/leptonvariation.cpp → src/leptonvariation.cpp
diff --git a/main.cpp → src/main.cpp b/main.cpp → src/main.cpp
diff --git a/rangeprovider.cpp → src/rangeprovider.cpp b/rangeprovider.cpp → src/rangeprovider.cpp
diff --git a/uvcacquisition.cpp → src/uvcacquisition.cpp b/uvcacquisition.cpp → src/uvcacquisition.cpp
diff --git a/uvcbuffer.cpp → src/uvcbuffer.cpp b/uvcbuffer.cpp → src/uvcbuffer.cpp
diff --git a/uvcvideoproducer.cpp → src/uvcvideoproducer.cpp b/uvcvideoproducer.cpp → src/uvcvideoproducer.cpp