Change some include

app/CMakeLists.txt

@@ -3,7 +3,7 @@
 ###
 
 # This is hard way - please fix
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ../lib ../modules ${CMAKE_BINARY_DIR}/modules )
+INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/modules ${CMAKE_BINARY_DIR}/modules )
 
 set(plaYUver_App_SRCS
 # Main

app/ConfigureFormatDialog.cpp

@@ -23,8 +23,8 @@
  */
 
 #include "ConfigureFormatDialog.h"
-#include "PlaYUVerFrame.h"
-#include "PlaYUVerStream.h"
+#include "lib/PlaYUVerFrame.h"
+#include "lib/PlaYUVerStream.h"
 
 namespace plaYUVer
 {

app/ConfigureFormatDialog.h

@@ -26,7 +26,7 @@
 #define __CONFIGUREFORMATDIALOG_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )

app/DialogSubWindowSelector.h

@@ -26,7 +26,7 @@
 #define __DIALOGSUBWINDOWSELECTOR_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )

app/GridManager.h

@@ -27,7 +27,7 @@
 #define __GRIDMANAGER_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <QRect>
 #include <QColor>
 #include <QPen>

app/HistogramWidget.cpp

@@ -27,13 +27,11 @@
 //      - Optimizar paintEvent. Parece haver codigo redundante  !! 
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
 #include <cmath>
 #include <QtGui>
 #include <QtDebug>
 #include "HistogramWidget.h"
 #include "PlaYUVerFrameStatistics.h"
-#include "PlaYUVerFrame.h"
 
 namespace plaYUVer
 {

app/HistogramWidget.h

@@ -27,10 +27,10 @@
 #define __HISTOGRAMWIDGET_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <QWidget>
 #include <QColor>
-#include "PlaYUVerFrame.h"
+#include "lib/PlaYUVerFrame.h"
 #include "PlaYUVerFrameStatistics.h"
 
 class QEvent;

app/ModuleHandleDock.h

@@ -26,7 +26,7 @@
 #define __MODULEHANDLEDOCK_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )

app/ModulesHandle.h

@@ -25,7 +25,6 @@
 #define __MODULESHANDLE_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
 
 #include <iostream>
 #include <cstdio>
@@ -37,7 +36,8 @@
 #include <QtGui>
 #endif
 #include "PlaYUVerAppModuleIf.h"
-#include "PlaYUVerFrame.h"
+#include "lib/PlaYUVerDefs.h"
+#include "lib/PlaYUVerFrame.h"
 
 namespace plaYUVer
 {

app/PlaYUVerAppModuleIf.h

@@ -26,11 +26,11 @@
 #define __PLAYUVERAPPMODULESIF_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
-#include "PlaYUVerFrame.h"
-#include "PlaYUVerStream.h"
+#include "lib/PlaYUVerFrame.h"
+#include "lib/PlaYUVerStream.h"
 #include "ModuleHandleDock.h"
 #include "PlaYUVerModuleIf.h"
 

app/PlaYUVerFrameStatistics.cpp

@@ -29,7 +29,7 @@
 
 #include <QtGui>
 #include "PlaYUVerFrameStatistics.h"
-#include "LibMemory.h"
+#include "lib/LibMemory.h"
 
 namespace plaYUVer
 {

app/PlaYUVerFrameStatistics.h

@@ -26,9 +26,9 @@
 #ifndef __PLAYUVERFRAMESTATISTICS_H_
 #define __PLAYUVERFRAMESTATISTICS_H_
 
-#include "PlaYUVerDefs.h"
 #include <QThread>
-#include "PlaYUVerFrame.h"
+#include "lib/PlaYUVerFrame.h"
+#include "lib/PlaYUVerDefs.h"
 
 class QObject;
 

app/PlaYUVerSettings.h

@@ -26,7 +26,7 @@
 #define __PLAYUVERSETTINGS_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <QtCore>
 #include "GridManager.h"
 #include "SubWindowHandle.h"

app/PropertiesSidebar.cpp

@@ -22,8 +22,6 @@
  * \brief    Main side bar definition
  */
 
-#include "config.h"
-#include "PlaYUVerDefs.h"
 #include <cmath>
 #include <QtGui>
 #include <QtDebug>

app/PropertiesSidebar.h

@@ -26,15 +26,15 @@
 #define __PROPERTIESSIDEBAR_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
 #include <QtGui>
 #include <QWidget>
 #endif
-#include "PlaYUVerStream.h"
-#include "PlaYUVerFrame.h"
+#include "lib/PlaYUVerStream.h"
+#include "lib/PlaYUVerFrame.h"
 #include "HistogramWidget.h"
 
 namespace plaYUVer

app/QualityMeasurementSidebar.cpp

@@ -22,7 +22,7 @@
  * \brief    Definition of the quality measurement sidebar
  */
 
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <QtGui>
 #include "QualityMeasurementSidebar.h"
 #include "SubWindowHandle.h"

app/QualityMeasurementSidebar.h

@@ -26,15 +26,14 @@
 #define __QUALITYMEASUREMENTSIDEBAR_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
 #include <QtGui>
 #include <QWidget>
 #endif
-#include "PlaYUVerStream.h"
-#include "PlaYUVerFrame.h"
+#include "lib/PlaYUVerStream.h"
+#include "lib/PlaYUVerFrame.h"
 #include "HistogramWidget.h"
 
 namespace plaYUVer

app/SubWindowHandle.h

@@ -26,13 +26,13 @@
 #define __SUBWINDOWHANDLE_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
 #include <QtGui>
 #endif
-#include "PlaYUVerStream.h"
+#include "lib/PlaYUVerStream.h"
 #include "ViewArea.h"
 #include "ModulesHandle.h"
 

app/ViewArea.cpp

@@ -37,7 +37,6 @@
 
 #include "ViewArea.h"
 #include "GridManager.h"
-#include "PlaYUVerStream.h"
 
 namespace plaYUVer
 {

app/ViewArea.h

@@ -27,13 +27,13 @@
 #define __VIEWAREA_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <QWidget>
 #include <QPixmap>
 #include <QBitmap>
 #include <QColor>
 #include "GridManager.h"
-#include "PlaYUVerFrame.h"
+#include "lib/PlaYUVerFrame.h"
 
 namespace plaYUVer
 {

app/WidgetFrameNumber.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
 #include <QtCore>
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>

app/WidgetFrameNumber.h

@@ -27,7 +27,7 @@
 
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #include <QtCore>
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>

app/main.cpp

@@ -25,7 +25,7 @@
 #include <QApplication>
 #include "config.h"
 #include "plaYUVerApp.h"
-#include "PlaYUVerStream.h"
+#include "lib/PlaYUVerStream.h"
 #ifdef USE_FERVOR
 #include "fvupdater.h"
 #endif

app/plaYUVerApp.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "plaYUVerApp.h"
-#include "PlaYUVerStream.h"
+#include "lib/PlaYUVerStream.h"
 #include "DialogSubWindowSelector.h"
 #ifdef USE_FERVOR
 #include "fvupdater.h"

app/plaYUVerApp.h

@@ -26,7 +26,7 @@
 #define __PLAYUVERAPP_H__
 
 #include "config.h"
-#include "PlaYUVerDefs.h"
+#include "lib/PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )

modules/CMakeLists.txt

@@ -2,7 +2,7 @@
 ### CMakeLists for playuver modules component
 ###
 
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib )
+INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} )
 
 # set(plaYUver_Mod_SRCS
 #     PlaYUVerModuleIf.cpp
@@ -30,9 +30,9 @@ ADD_MODULE( FilterComponentChromaU "FilterComponent" )
 ADD_MODULE( FilterComponentChromaV "FilterComponent" )
 ADD_MODULE( FrameDifference "FrameDifference" )
 ADD_MODULE( MeasurePSNR "MeasurePSNR" )
-# IF( USE_OPENCV )
-#   ADD_MODULE( DisparityStereoVar "DisparityStereoVar" )
-# ENDIF()
+IF( USE_OPENCV )
+  ADD_MODULE( DisparityStereoVar "DisparityStereoVar" )
+ENDIF()
 
 
 #

modules/DisparityStereoVar.cpp

@@ -25,7 +25,6 @@
 #include <cstdio>
 
 #include "DisparityStereoVar.h"
-#include "PlaYUVerFrame.h"
 
 namespace plaYUVer
 {

modules/DisparityStereoVar.h

@@ -25,10 +25,7 @@
 #ifndef __DISPARITYSTEREOVAR_H__
 #define __DISPARITYSTEREOVAR_H__
 
-#include "PlaYUVerDefs.h"
 #include <iostream>
-#include <cstdio>
-#include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"
 #include <opencv2/opencv.hpp>
 

modules/FilterComponent.cpp

@@ -23,7 +23,6 @@
  */
 
 #include <cstdio>
-
 #include "FilterComponent.h"
 
 namespace plaYUVer

modules/FilterComponent.h

@@ -25,14 +25,8 @@
 #ifndef __FILTERCOMPONENT_H__
 #define __FILTERCOMPONENT_H__
 
-#include "PlaYUVerDefs.h"
-#include <iostream>
-#include <cstdio>
-#include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"
 
-#include <cassert>
-
 namespace plaYUVer
 {
 

modules/FrameDifference.cpp

@@ -22,10 +22,7 @@
  * \brief    Frame Difference module
  */
 
-#include <cstdio>
-
 #include "FrameDifference.h"
-#include "PlaYUVerFrame.h"
 
 namespace plaYUVer
 {

modules/FrameDifference.h

@@ -25,10 +25,6 @@
 #ifndef __FRAMEDIFFERENCE_H__
 #define __FRAMEDIFFERENCE_H__
 
-#include "PlaYUVerDefs.h"
-#include <iostream>
-#include <cstdio>
-#include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"
 
 #include <cassert>

modules/MeasurePSNR.cpp

@@ -22,10 +22,7 @@
  * \brief    Frame Difference module
  */
 
-#include <cstdio>
-
 #include "MeasurePSNR.h"
-#include "PlaYUVerFrame.h"
 
 namespace plaYUVer
 {

modules/MeasurePSNR.h

@@ -25,14 +25,8 @@
 #ifndef __MEASUREPSNR_H__
 #define __MEASUREPSNR_H__
 
-#include "PlaYUVerDefs.h"
-#include <iostream>
-#include <cstdio>
-#include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"
 
-#include <cassert>
-
 namespace plaYUVer
 {
 

modules/PlaYUVerModuleIf.h

@@ -25,11 +25,9 @@
 #ifndef __PLAYUVERMODULESIF_H__
 #define __PLAYUVERMODULESIF_H__
 
-#include "PlaYUVerDefs.h"
-#include <iostream>
-#include <cstdio>
-#include "PlaYUVerFrame.h"
-#include "PlaYUVerStream.h"
+#include "lib/PlaYUVerDefs.h"
+#include "lib/PlaYUVerFrame.h"
+#include "lib/PlaYUVerStream.h"
 
 namespace plaYUVer
 {