From a5a7c4b974930db59c84c3ecf3559f0cfabee812 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 13 Aug 2011 01:12:29 +0200 Subject: [PATCH] Qt: video filter dialog update - Rearrangements of effects in categories - Addition of antiflickering, gaussian, mirror - Removal of useless filters, like pano (wall is here) - Removal of rarely used vars - Simplifications --- .../gui/qt4/components/extended_panels.cpp | 20 +- modules/gui/qt4/ui/video_effects.ui | 1673 +++++++++-------- 2 files changed, 927 insertions(+), 766 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index f11f4b3eb6..e62c31ff5d 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -116,15 +116,17 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : { \ vlc_object_release( p_obj ); \ if( checkbox ) checkbox->setChecked( true ); \ - else groupbox->setChecked( true ); \ + else if (groupbox) groupbox->setChecked( true ); \ } \ else \ { \ if( checkbox ) checkbox->setChecked( false ); \ - else groupbox->setChecked( false ); \ + else if (groupbox) groupbox->setChecked( false ); \ } \ } \ CONNECT( ui.widget##Enable, clicked(), this, updateFilters() ); + + #define SETUP_VFILTER_OPTION( widget, signal ) \ initComboBoxItems( ui.widget ); \ setWidgetValue( ui.widget ); \ @@ -142,7 +144,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) ) SETUP_VFILTER( posterize ) - SETUP_VFILTER_OPTION( posterizeLevelSpin, valueChanged( int ) ) SETUP_VFILTER( colorthres ) SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) ) @@ -195,10 +196,6 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER_OPTION( wallRowsSpin, valueChanged( int ) ) SETUP_VFILTER_OPTION( wallColsSpin, valueChanged( int ) ) - SETUP_VFILTER( panoramix ) - SETUP_VFILTER_OPTION( panoramixRowsSpin, valueChanged( int ) ) - SETUP_VFILTER_OPTION( panoramixColsSpin, valueChanged( int ) ) - SETUP_VFILTER( erase ) SETUP_VFILTER_OPTION( eraseMaskText, editingFinished() ) @@ -223,6 +220,15 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER( grain ) SETUP_VFILTER_OPTION( grainVarianceSlider, valueChanged( int ) ) + SETUP_VFILTER( mirror ) + + SETUP_VFILTER( gaussianblur ) + SETUP_VFILTER_OPTION( gaussianbluSigmaSlider, valueChanged( int ) ) + + SETUP_VFILTER( antiflicker ) + SETUP_VFILTER_OPTION( antiflickerSofteningSizeSlider, valueChanged( int ) ) + + if( module_exists( "atmo" ) ) { SETUP_VFILTER( atmo ) diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui index 18ccb8f763..c250a553c4 100644 --- a/modules/gui/qt4/ui/video_effects.ui +++ b/modules/gui/qt4/ui/video_effects.ui @@ -6,16 +6,16 @@ 0 0 - 629 - 321 + 550 + 327 - 3 + 0 - Basic + Essential @@ -87,6 +87,11 @@ + + + 8 + + Brightness Threshold @@ -317,7 +322,7 @@ Crop - + @@ -330,6 +335,9 @@ + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + px @@ -348,15 +356,21 @@ - - - - px + + + + Qt::Vertical - - 4095 + + QSizePolicy::MinimumExpanding - + + + 20 + 40 + + + @@ -368,17 +382,7 @@ - - - - px - - - 4095 - - - - + Bottom @@ -388,8 +392,11 @@ - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + px @@ -398,47 +405,57 @@ - + Synchronize top and bottom - + Synchronize left and right - - - - Qt::Vertical + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - QSizePolicy::Expanding + + px - - - 20 - 40 - + + 4095 - + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + px + + + 4095 + + - + - Geometry + Colors - - - + + + - Rotate + Color extraction true @@ -447,54 +464,71 @@ false - - + + + + + 0 + 0 + + - Angle + Color - rotateAngleDial + extractComponentText - - - - 359 + + + + + 140 + 16777215 + - - 180 + + >HHHHHH;# - - 180 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - Transform + + + + + 0 + 0 + - - true + + Negate colors - - false + + + + + + Posterize - - - - - - - + + + + + 0 + 0 + + - Puzzle game + Gradient true @@ -502,78 +536,42 @@ false - - - - - 2 - - - 16 - - - 4 - - - - - - - 2 - - - 16 - - - 4 + + + + + Mode - - - - Black slot + + + + + 0 + 0 + - - + + - Columns - - - puzzleColsSpin + Color - - + + - Rows - - - puzzleRowsSpin + Cartoon - - - - Magnification/Zoom - - - - - - - - Color - - - + Color threshold @@ -584,28 +582,36 @@ false - - - + + + + + + 0 + 0 + + - Similarity + Color - colorthresSimilaritythresSlider + colorthresColorText - - - - Qt::Horizontal + + + + + 140 + 16777215 + - - - - - - Qt::Horizontal + + >HHHHHH;# + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -619,69 +625,49 @@ - - - - Color + + + + + 0 + 0 + - - colorthresColorText + + Qt::Horizontal - - - - >HHHHHH;# + + + + Similarity + + + colorthresSimilaritythresSlider - - - - - - - Gradient - - - true - - - false - - - - - - Mode - - - - - - - Color + + + + + 0 + 0 + - - - - - - Cartoon + + Qt::Horizontal - - - - - + + - Posterize + Sepia true @@ -689,34 +675,58 @@ false - - - + + + - Posterize level + Intensity - - - - 2 - + + - 256 + 255 - 3 + 30 - - + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Geometry + + + + + + Interactive Zoom + + + + + - Motion blur + Wall true @@ -724,46 +734,66 @@ false - + - + - Factor + Rows - blurFactorSlider + wallRowsSpin - - + + + + Columns + + + wallColsSpin + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + 1 - - 127 - - 80 + 3 - - Qt::Horizontal + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - QSlider::TicksBelow + + 1 - - 16 + + 3 - - + + + + + 0 + 0 + + - Color extraction + Transform true @@ -771,28 +801,23 @@ false - + - - - Color - - - - - - - >HHHHHH;# - - + - - + + + + + 0 + 0 + + - Sepia + Rotate true @@ -800,80 +825,49 @@ false - - - + + + + + + 0 + 0 + + - Intensity + Angle + + + rotateAngleDial - - + + + + + 0 + 0 + + - 255 + 359 - 30 + 180 + + + 180 - - - - - - Motion detect - - - - - - - Water effect - - - - - - - Waves - - - - - - - Psychedelic - - - - - - - - - Invert colors - - - - - - - - true - - - AtmoLight - - - - + + - AtmoLight + Puzzle game true @@ -881,196 +875,176 @@ false - + - + - Edge weightning + Rows - atmoEdgeweightningSlider + puzzleRowsSpin - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 1 + 2 - 30 - - - 5 + 16 - 3 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 3 - - - - - - - Output Color Filtermode - - - atmoFiltermodeCombo + 4 - + - Brightness (%) + Columns - atmoBrightnessSlider + puzzleColsSpin - - - 50 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 300 + + 2 - - 10 + + 16 - 100 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 10 + 4 - - - - - + + - Darkness limit - - - atmoDarknesslimitSlider + Black slot - - - - 0 - - - 10 - - - 10 - - - 3 - - - Qt::Horizontal + + + + + + + + Overlay + + + + + + Add logo + + + true + + + false + + + + + + + 50 + 0 + - - QSlider::TicksBelow + + Logo - - 1 + + logoFileText - - + + + + + - Mark analyzed Pixels + ... - - + + + + + 50 + 0 + + - Filter length (ms) + Top - atmoMeanlengthSlider + logoYSpin - - - - 300 - - - 5000 - - - 10 - - - 50 - - - 300 - - - Qt::Horizontal + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - QSlider::TicksBelow + + px - - 200 + + 4096 - - + + + + + 50 + 0 + + - Filter threshold (%) + Left - atmoMeanthresholdSlider + logoXSpin - - - - 1 - - - 100 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 1 + + px - - 10 + + 4096 - - 40 + + + + + + 255 Qt::Horizontal @@ -1079,62 +1053,88 @@ QSlider::TicksBelow - 10 + 32 - - + + + + + 8 + + - Filter smoothness (%) + full + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - atmoPercentnewSlider + logoOpacitySlider - - - - 1 + + + + + 0 + 0 + - - 100 + + + 50 + 0 + - - 1 + + Transparency - - 10 + + logoOpacitySlider - - 50 + + + + + + + 8 + - - Qt::Horizontal + + none - - QSlider::TicksBelow + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - 10 + + logoOpacitySlider + + + + + + + Qt::Horizontal - - - - - Vout/Overlay - - - - + + + + + 0 + 0 + + - Wall + Add text true @@ -1142,64 +1142,9 @@ false - - - - - Rows - - - wallRowsSpin - - - - - - - Columns - - - wallColsSpin - - - - - - - 1 - - - 3 - - - - - - - 1 - - - 3 - - - - - - - - - - Add text - - - true - - - false - - - - + + + Position @@ -1227,10 +1172,10 @@ - - + + - Panoramix + Logo erase true @@ -1239,95 +1184,120 @@ false - - + + + + + 50 + 0 + + - Rows + Top - panoramixRowsSpin + eraseYSpin - - - - 1 + + + + + 50 + 0 + - - 3 + + Left + + + eraseXSpin - - - - Columns + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - panoramixColsSpin + + px + + + 4096 - - - - 1 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 3 + + px + + + 4096 - - - - - - - Clone - - - true - - - false - - + + + - + + + + 50 + 0 + + - Number of clones + Mask - cloneCountSpin + eraseMaskText - - - - 1 - - - 2 + + + + ... + + + + Qt::Vertical + + + + 20 + 40 + + + + - + + + true + - Logo + AtmoLight - + - + - Add logo + AtmoLight true @@ -1335,111 +1305,113 @@ false - + - - - - 50 - 0 - - + - Logo + Edge weightning - logoFileText + atmoEdgeweightningSlider - - - - - - - ... + + + + 1 - - - - - - - 50 - 0 - + + 30 - - Top + + 5 - - logoYSpin + + 3 - - - - - - - - - pixels + + Qt::Horizontal + + + QSlider::TicksBelow + + + 3 - - - - - 50 - 0 - - + + - Left + Output Color Filtermode - logoXSpin + atmoFiltermodeCombo - - - - - + + - pixels + Brightness (%) + + + atmoBrightnessSlider - - - - - 0 - 0 - + + + + 50 - - - 50 - 0 - + + 300 + + + 10 + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + + + + + + - Transparency + Darkness limit - logoOpacitySlider + atmoDarknesslimitSlider - - + + + + 0 + - 255 + 10 + + + 10 + + + 3 Qt::Horizontal @@ -1448,53 +1420,145 @@ QSlider::TicksBelow - 32 + 1 - - - - - 8 - - + + - none + Mark analyzed Pixels - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + Filter length (ms) - logoOpacitySlider + atmoMeanlengthSlider - - - - - 8 - + + + + 300 + + + 5000 + + + 10 + + 50 + + + 300 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 200 + + + + + - full + Filter threshold (%) - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + atmoMeanthresholdSlider + + + + + + + 1 + + + 100 + + + 1 + + + 10 + + + 40 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + + + + + + Filter smoothness (%) - logoOpacitySlider + atmoPercentnewSlider + + + + + + + 1 + + + 100 + + + 1 + + + 10 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 - - + + + + + Advanced + + + + - Logo erase + Motion blur true @@ -1502,104 +1566,225 @@ false - - - - - - 50 - 0 - - + + + - Top + Factor - eraseYSpin + blurFactorSlider - - - - - 50 - 0 - + + + + 1 + + + 127 + + 80 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 16 + + + + + + + + + + Motion detect + + + + + + + Psychedelic + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Anti-Flickering + + + true + + + false + + + + - Left + Soften - eraseXSpin + blurFactorSlider - - - - - - - - + + + + 0 + + + 100 + + + 80 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 16 + + + + + + + + + + 0 + 0 + + + + Clone + + + true + + + false + + - - - - 50 - 0 - - + - Mask + Number of clones - eraseMaskText + cloneCountSpin - - - - pixels + + + + 1 + + + 2 - - + + + + + + + Water effect + + + + + + + Spatial blur + + + true + + + false + + + + - pixels + Sigma + + + blurFactorSlider - - - - Qt::Vertical + + + + 1 - - QSizePolicy::Fixed + + 127 - - - 20 - 40 - + + 80 - - - - - - ... + + Qt::Horizontal + + + QSlider::TicksBelow + + + 16 + + + + Mirror + + + + + + + Waves + + + @@ -1618,41 +1803,22 @@ grainEnable grainVarianceSlider cropTopPx - cropLeftPx - cropRightPx cropBotPx topBotCropSync leftRightCropSync rotateEnable rotateAngleDial - transformEnable transformTypeCombo - puzzleEnable puzzleRowsSpin puzzleColsSpin puzzleBlackSlotCheck - magnifyEnable colorthresEnable colorthresColorText colorthresSaturationthresSlider colorthresSimilaritythresSlider - extractEnable extractComponentText - invertEnable - gradientEnable gradientModeCombo - gradientTypeCheck - gradientCartoonCheck - sepiaEnable sepiaIntensitySpin - posterizeEnable - posterizeLevelSpin - motionblurEnable - blurFactorSlider - motiondetectEnable - rippleEnable - waveEnable - psychedelicEnable atmoEnable atmoEdgeweightningSlider atmoBrightnessSlider @@ -1662,23 +1828,12 @@ atmoPercentnewSlider atmoFiltermodeCombo atmoShowdotsCheck - wallEnable - wallRowsSpin - wallColsSpin - panoramixEnable - panoramixRowsSpin - panoramixColsSpin - marqEnable - marqMarqueeText - marqPositionCombo - cloneEnable cloneCountSpin logoEnable logoFileText logoYSpin logoXSpin logoOpacitySlider - eraseEnable eraseMaskText eraseYSpin eraseXSpin -- 2.39.2