From 944badc866f5dbe3369cdd5a86cd7f46291cd18d Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 13 Jun 2014 01:38:42 +0100 Subject: [PATCH] Add new resolutions --- CMakeLists.txt | 2 +- source/app/ConfigureFormatDialog.cpp | 4 ++-- source/app/ConfigureFormatDialog.h | 8 ++++++++ source/app/plaYUVerApp.cpp | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f0ee49..8ed599f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SRC_DIR}/ FILE( GLOB SOURCES_FILES ${SRC_DIR}/app/*.cpp ${SRC_DIR}/lib/*.cpp ) FILE( GLOB FORMS_FILES ${UI_DIR}/*.ui ) -FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc ) +FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc ${RSC_DIR}/*.rc ) # must go before the project command SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) diff --git a/source/app/ConfigureFormatDialog.cpp b/source/app/ConfigureFormatDialog.cpp index c0fbad4..4cea6b1 100755 --- a/source/app/ConfigureFormatDialog.cpp +++ b/source/app/ConfigureFormatDialog.cpp @@ -101,12 +101,12 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) : resolutionLabel->setText( "Resolution chosen" ); QLabel* widthLabel = new QLabel( "Width" ); m_spinBoxWidth = new QSpinBox(); - m_spinBoxWidth->setRange( 0, 7240 ); + m_spinBoxWidth->setRange( 0, 8192 ); m_spinBoxWidth->setValue( 0 ); QLabel* heightLabel = new QLabel( "Height" ); m_spinBoxheight = new QSpinBox(); - m_spinBoxheight->setRange( 0, 5432 ); + m_spinBoxheight->setRange( 0, 4608 ); m_spinBoxheight->setValue( 0 ); QLabel* pixelsLabel = new QLabel(); diff --git a/source/app/ConfigureFormatDialog.h b/source/app/ConfigureFormatDialog.h index 7fddcce..a4ea1f8 100755 --- a/source/app/ConfigureFormatDialog.h +++ b/source/app/ConfigureFormatDialog.h @@ -77,7 +77,15 @@ private: ADD_STANDARD_RESOLUTION( "VGA (640x480)", 640, 480 ); ADD_STANDARD_RESOLUTION( "XVGA (1024x768)", 1024, 768 ); ADD_STANDARD_RESOLUTION( "HD (1280x720)", 1280, 720 ); + ADD_STANDARD_RESOLUTION( "XVGA (1024x768)", 1024, 768 ); + ADD_STANDARD_RESOLUTION( "XVGA (1024x768)", 1024, 768 ); + ADD_STANDARD_RESOLUTION( "SXGA- (1280x900)", 1280, 900 ); + ADD_STANDARD_RESOLUTION( "SXGA (1280x1024)", 1280, 1024 ); + ADD_STANDARD_RESOLUTION( "WSXGA (1440x900)", 1440, 900 ); ADD_STANDARD_RESOLUTION( "Full HD (1920x1080)", 1920, 1080 ); + ADD_STANDARD_RESOLUTION( "WQXGA (2560x1600)", 2560, 1600 ); + ADD_STANDARD_RESOLUTION( "Ultra HD (3840x2160)", 3840, 2160 ); + ADD_STANDARD_RESOLUTION( "8K", 8192, 4608 ); } }; diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 7dc87e0..4e9ae91 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -671,7 +671,7 @@ Void plaYUVerApp::updatePixelValueStatusBar( const QPoint & pos, PlaYUVerFrame* sPixelValue = curFrame->getPixelValue( pos, PlaYUVerFrame::COLOR_YUV ); strPixel = QString( "Y: %1 U: %2 V: %3" ).arg( sPixelValue.Luma ).arg( sPixelValue.ChromaU ).arg( sPixelValue.ChromaV ); strStatus.append( strPixel ); - statusBar()->showMessage( strStatus, 0 ); + statusBar()->showMessage( strStatus, 3000 ); } else {