Merge branch 'devel' of https://github.com/pixlra/playuver into devel

This commit is contained in:
Luis Lucas committed 2015-01-13 23:03:59 +00:00
commit 4794674359
10 files changed
+42 -43

No files matched your search

+12 -11
View File
@@ -9,24 +9,25 @@ set(plaYUver_App_SRCS
# Main
main.cpp
plaYUVerApp.cpp
VideoHandle.cpp
QualityHandle.cpp
ModulesHandle.cpp
PlaYUVerAppModuleIf.cpp
GridManager.cpp
Settings.cpp
# Sub Window
SubWindowHandle.cpp
Settings.cpp
# Module Video
VideoSubWindow.cpp
ViewArea.cpp
VideoHandle.cpp
FramePropertiesSidebar.cpp
# Module Quality
QualityHandle.cpp
QualityMeasurementSidebar.cpp
# Module Plugins
ModulesHandle.cpp
ModuleHandleDock.cpp
PlaYUVerAppModuleIf.cpp
GridManager.cpp
# Dialogs
AboutDialog.cpp
ConfigureFormatDialog.cpp
DialogSubWindowSelector.cpp
# Docks / Sidebars
ModuleHandleDock.cpp
PropertiesSidebar.cpp
QualityMeasurementSidebar.cpp
# Widgets
HistogramWidget.cpp
WidgetFrameNumber.cpp
@@ -18,27 +18,18 @@
*/
/**
* \file PropertiesSidebar.cpp
* \file FramePropertiesSideBar.cpp
* \brief Main side bar definition
*/
#include <cmath>
#include <QtGui>
#include <QtDebug>
#include "PropertiesSidebar.h"
#include "FramePropertiesSidebar.h"
namespace plaYUVer
{
static inline QSize bestSize( QSize currSize )
{
QSize bestSize( 180, currSize.height() );
if( currSize.width() < bestSize.width() )
return bestSize;
else
return currSize;
}
FramePropertiesSideBar::FramePropertiesSideBar( QWidget* parent, Bool* pbMainPlaySwitch ) :
QWidget( parent ),
pbMainPlaySwitch( pbMainPlaySwitch )
@@ -262,7 +253,11 @@ FramePropertiesSideBar::~FramePropertiesSideBar()
QSize FramePropertiesSideBar::sizeHint() const
{
return bestSize( size() );
QSize currSize = size();
QSize bestSize( 180, currSize.height() );
if( currSize.width() < bestSize.width() )
return bestSize;
return currSize;
}
Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame, Bool isPlaying )
@@ -392,7 +387,7 @@ Void FramePropertiesSideBar::updateDataHistogram()
// image is the same in Image Viewer, then compute too the histogram
// for this selection.
// New frame required to separate from the thread
histogramWidget->updateData( new PlaYUVerFrame(m_pcFrame), NULL );
histogramWidget->updateData( m_pcFrame, NULL );
fullImageButton->hide();
selectionImageButton->hide();
}
@@ -18,12 +18,12 @@
*/
/**
* \file PropertiesSidebar.h
* \file FramePropertiesSidebar.h
* \brief Main side bar definition
*/
#ifndef __PROPERTIESSIDEBAR_H__
#define __PROPERTIESSIDEBAR_H__
#ifndef __FRAMEPROPERTIESSIDEBAR_H__
#define __FRAMEPROPERTIESSIDEBAR_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
@@ -132,4 +132,4 @@ private Q_SLOTS:
} // NAMESPACE
#endif // __PROPERTIESSIDEBAR_H__
#endif // __FRAMEPROPERTIESSIDEBAR_H__
+1 -1
View File
@@ -34,7 +34,7 @@
#endif
#include "VideoSubWindow.h"
#include "WidgetFrameNumber.h"
#include "PropertiesSidebar.h"
#include "FramePropertiesSidebar.h"
namespace plaYUVer
{
-1
View File
@@ -41,7 +41,6 @@
#include "VideoHandle.h"
#include "QualityHandle.h"
#include "ModulesHandle.h"
#include "PropertiesSidebar.h"
#include "AboutDialog.h"
#include "WidgetFrameNumber.h"
+1 -1
View File
@@ -43,7 +43,7 @@ PlaYUVerFrameStats::PlaYUVerFrameStats() :
PlaYUVerFrameStats::~PlaYUVerFrameStats()
{
if( m_pdHistogram )
delete[] m_pdHistogram;
freeMem1D( m_pdHistogram );
}
+1
View File
@@ -254,6 +254,7 @@ Void PlaYUVerStream::close()
#ifdef USE_FFMPEG
if( m_uiStreamHandler == FFMPEG )
m_cLibAvContext->closeAvFormat();
delete m_cLibAvContext;
#endif
if( m_ppcFrameBuffer )
+4 -4
View File
@@ -28,18 +28,18 @@
namespace plaYUVer
{
FilterComponent::FilterComponent()
FilterComponentModule::FilterComponentModule()
{
m_pcFilteredFrame = NULL;
}
Void FilterComponent::createFilter( UInt uiWidth, UInt uiHeight )
Void FilterComponentModule::createFilter( UInt uiWidth, UInt uiHeight )
{
m_pcFilteredFrame = NULL;
m_pcFilteredFrame = new PlaYUVerFrame( uiWidth, uiHeight, PlaYUVerFrame::GRAY );
}
PlaYUVerFrame* FilterComponent::filterComponent( PlaYUVerFrame* InputFrame, Int Component )
PlaYUVerFrame* FilterComponentModule::filterComponent( PlaYUVerFrame* InputFrame, Int Component )
{
Pel*** pppOutputPelYUV = m_pcFilteredFrame->getPelBufferYUV();
Pel*** pppInputPelYUV = InputFrame->getPelBufferYUV();
@@ -47,7 +47,7 @@ PlaYUVerFrame* FilterComponent::filterComponent( PlaYUVerFrame* InputFrame, Int
return m_pcFilteredFrame;
}
Void FilterComponent::destroy()
Void FilterComponentModule::destroy()
{
if( m_pcFilteredFrame )
delete m_pcFilteredFrame;
+10 -7
View File
@@ -30,21 +30,24 @@
namespace plaYUVer
{
class FilterComponent
class FilterComponentModule: public PlaYUVerModuleIf
{
private:
PlaYUVerFrame* m_pcFilteredFrame;
public:
FilterComponent();
virtual ~FilterComponent()
FilterComponentModule();
virtual ~FilterComponentModule()
{
}
Void create( PlaYUVerFrame* ) = 0;
PlaYUVerFrame* process( PlaYUVerFrame* ) = 0;
Void destroy();
Void createFilter( UInt uiWidth, UInt uiHeight );
PlaYUVerFrame* filterComponent( PlaYUVerFrame* InputFrame, Int Component );
Void destroy();
};
class FilterComponentLuma: public FilterComponent, public PlaYUVerModuleIf
class FilterComponentLuma: public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentLuma )
public:
@@ -56,7 +59,7 @@ public:
PlaYUVerFrame* process( PlaYUVerFrame* InputFrame );
};
class FilterComponentChromaU: public FilterComponent, public PlaYUVerModuleIf
class FilterComponentChromaU: public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentChromaU )
public:
@@ -68,7 +71,7 @@ public:
PlaYUVerFrame* process( PlaYUVerFrame* InputFrame );
};
class FilterComponentChromaV: public FilterComponent, public PlaYUVerModuleIf
class FilterComponentChromaV: public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentChromaV )
public:
+1 -1
View File
@@ -100,7 +100,7 @@ public:
virtual Double measure( PlaYUVerFrame*, PlaYUVerFrame* ) { return 0; }
virtual Double measure( PlaYUVerFrame*, PlaYUVerFrame*, PlaYUVerFrame* ) { return 0; }
virtual Void destroy() { }
virtual Void destroy() = 0;
};