From df38f3d832ecf9be64db7772695ea3d980eebb21 Mon Sep 17 00:00:00 2001 From: JFilipe Date: Thu, 28 Feb 2019 21:42:29 +0000 Subject: [PATCH] Name of the file is now read form the end to the begining, in order to guess seuqence format --- .gitignore | 2 ++ app/VideoSubWindow.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 60401c7..5100d72 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff +.idea/ .idea/**/workspace.xml .idea/**/tasks.xml .idea/**/usage.statistics.xml @@ -71,6 +72,7 @@ # .idea/modules # CMake +bin/ build/ cmake-build-*/ diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp index 9e49d61..7c186d7 100644 --- a/app/VideoSubWindow.cpp +++ b/app/VideoSubWindow.cpp @@ -490,7 +490,7 @@ bool VideoSubWindow::guessFormat( QString filename, unsigned int& rWidth, unsign QRegularExpressionMatch resolutionMatch = QRegularExpression( "_\\d*x\\d*" ).match( FilenameShort ); if( resolutionMatch.hasMatch() ) { - QString resolutionString = resolutionMatch.captured( 0 ); + QString resolutionString = resolutionMatch.captured( resolutionMatch.lastCapturedIndex() ); if( resolutionString.startsWith( "_" ) || resolutionString.endsWith( "_" ) ) { resolutionString.remove( "_" ); @@ -539,7 +539,7 @@ bool VideoSubWindow::guessFormat( QString filename, unsigned int& rWidth, unsign QRegularExpressionMatch BppMatch = QRegularExpression( "_\\d*bpp" ).match( FilenameShort ); if( BppMatch.hasMatch() ) { - QString matchString = BppMatch.captured( 0 ); + QString matchString = BppMatch.captured( BppMatch.lastCapturedIndex() ); matchString.remove( "_" ); matchString.remove( "bpp" ); rBitsPerPixel = matchString.toUInt(); @@ -553,7 +553,7 @@ bool VideoSubWindow::guessFormat( QString filename, unsigned int& rWidth, unsign QRegularExpressionMatch FpsMatch = QRegularExpression( "_\\d*fps" ).match( FilenameShort ); if( FpsMatch.hasMatch() ) { - QString matchString = FpsMatch.captured( 0 ); + QString matchString = FpsMatch.captured( FpsMatch.lastCapturedIndex() ); matchString.remove( "_" ); matchString.remove( "fps" ); rFrameRate = matchString.toUInt();