From 7edb312503692443791d63df644c6e52e9c737c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Weber?= Date: Tue, 26 Jan 2010 19:51:53 +0100 Subject: [PATCH] Added AtmoLight tab inside video effects dialog allows only to control some important options of the AtmoLight module, which control the color calculation. Hardware setup has to be done inside the normal video filter setup. --- .../gui/qt4/components/extended_panels.cpp | 17 + modules/gui/qt4/ui/video_effects.ui | 1166 +++++++++++------ 2 files changed, 761 insertions(+), 422 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index f12624bc0f..dfc994ddda 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -205,6 +205,23 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) ) SETUP_VFILTER_OPTION( logoTransparencySlider, valueChanged( int ) ) + if( module_exists( "atmo" ) ) + { + SETUP_VFILTER( atmo ) + SETUP_VFILTER_OPTION( atmoEdgeweightningSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoBrightnessSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoDarknesslimitSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoMeanlengthSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoMeanthresholdSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoPercentnewSlider, valueChanged( int ) ) + SETUP_VFILTER_OPTION( atmoFiltermodeCombo, currentIndexChanged( int ) ) + SETUP_VFILTER_OPTION( atmoShowdotsCheck, stateChanged( int ) ) + } + else + { + _parent->removeTab( _parent->indexOf( ui.tab_atmo ) ); + } + #undef SETUP_VFILTER #undef SETUP_VFILTER_OPTION diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui index 2f9f45ab2f..0e40d4a78e 100644 --- a/modules/gui/qt4/ui/video_effects.ui +++ b/modules/gui/qt4/ui/video_effects.ui @@ -1,77 +1,78 @@ - + + ExtVideoWidget - - + + 0 0 - 533 - 275 + 619 + 280 - + 0 - - + + Basic - - - - + + + + Transform - + true - + false - - - + + + - - - + + + Sharpen - + true - + false - - - - + + + + Sigma - - - + + + 200 - + 1 - + 10 - + Qt::Horizontal - + QSlider::TicksBothSides - + 100 @@ -79,142 +80,142 @@ - - - + + + true - + Image adjust - + true - + false - - + + 0 - - - + + + 360 - + Qt::Horizontal - + QSlider::TicksBothSides - + 60 - - - + + + 500 - + Qt::Horizontal - + QSlider::TicksBothSides - + 50 - - - + + + 300 - + Qt::Horizontal - + QSlider::TicksBothSides - + 100 - - - + + + 200 - + Qt::Horizontal - + QSlider::TicksBothSides - + 100 - - - + + + 200 - + Qt::Horizontal - + QSlider::TicksBothSides - + 100 - - - + + + Gamma - - - + + + Contrast - - - + + + Brightness - - - + + + Saturation - - - + + + Hue - - - + + + Brightness threshold @@ -224,102 +225,102 @@ - - + + Crop - - - - + + + + Top - - - + + + px - + 4095 - - - + + + Left - - - + + + px - + 4095 - - - + + + Right - - - + + + px - + 4095 - - - + + + Bottom - - - + + + px - + 4095 - - - + + + Synchronize top and bottom - - - + + + Synchronize left and right - + - + Qt::Vertical - + QSizePolicy::Expanding - + 20 40 @@ -329,73 +330,73 @@ - - + + Geometry - - - - + + + + Magnification/Zoom - - - + + + Puzzle game - + true - + false - - - - + + + + 2 - + 16 - + 4 - - - + + + 2 - + 16 - + 4 - - - + + + Black slot - - - + + + Columns - - - + + + Rows @@ -403,34 +404,34 @@ - - - + + + Rotate - + true - + false - - - - + + + + 359 - + 180 - + 180 - - - + + + Angle @@ -440,98 +441,98 @@ - - + + Color fun - - - - + + + + Color extraction - + true - + false - - - - + + + + Color - - - - >HHHHHH;# + + + + >HHHHHH;# - - - + + + Invert colors - - - + + + Color threshold - + true - + false - - - - + + + + Similarity - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - - - + + + Saturation - - - + + + Color - - - - >HHHHHH;# + + + + >HHHHHH;# @@ -540,83 +541,83 @@ - - + + Image modification - - - - + + + + Waves - - - + + + Water effect - - - + + + Psychedelic - - - + + + Noise - - - + + + Motion detect - - - + + + Motion blur - + true - + false - - - - + + + + Factor - - - + + + 1 - + 127 - + 80 - + Qt::Horizontal - + QSlider::TicksBothSides - + 16 @@ -624,94 +625,337 @@ - - - + + + Gradient - + true - + false - - - - + + + + Mode - - - + + + Color - - - + + + Cartoon - - + + - - + + + true + + + AtmoLight + + + + + + AtmoLight + + + true + + + false + + + + + + Edge weightning + + + + + + + 1 + + + 30 + + + 5 + + + 3 + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 3 + + + + + + + Output Color Filtermode + + + + + + + Brightness (%) + + + + + + + 50 + + + 300 + + + 10 + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 10 + + + + + + + + + + Darknesslimit + + + + + + + 0 + + + 10 + + + 10 + + + 3 + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 1 + + + + + + + Mark analyzed Pixels + + + + + + + Filter length (ms) + + + + + + + 300 + + + 5000 + + + 10 + + + 50 + + + 300 + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 200 + + + + + + + Filter threshold (%) + + + + + + + 1 + + + 100 + + + 1 + + + 10 + + + 40 + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 10 + + + + + + + Filter smoothness (%) + + + + + + + 1 + + + 100 + + + 1 + + + 10 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 10 + + + + + + + + + + Vout/Overlay - - - - + + + + Wall - + true - + false - - - - + + + + Rows - - - + + + Columns - - - + + + 1 - + 3 - - - + + + 1 - + 3 @@ -719,83 +963,83 @@ - - - + + + Add text - + true - + false - - - - + + + + Position - - - + + + Text - - + + - - + + - - - + + + Panoramix - + true - + false - - - - + + + + Rows - - - + + + 1 - + 3 - - - + + + Columns - - - + + + 1 - + 3 @@ -803,31 +1047,31 @@ - - - + + + Clone - + true - + false - - - - + + + + Number of clones - - - + + + 1 - + 2 @@ -837,117 +1081,117 @@ - - + + Logo - - - - + + + + Add logo - + true - + false - - - - + + + + Transparency - - - + + + Left - - - + + + Top - - - + + + 255 - + Qt::Horizontal - + QSlider::TicksBothSides - + 32 - - + + - - + + - - - + + + Logo - - + + - - - + + + Logo erase - + true - + false - - - - + + + + Top - - - + + + Left - - + + - - + + - - + + - - - + + + Mask @@ -957,58 +1201,136 @@ - - + + Advanced video filter controls - - - + + + - - - + + + Subpicture filters - - + + - - - + + + Video filters - - - + + + Vout filters - - - + + + Reset - - - + + + Update - - + + + + eraseEnable + eraseMaskText + eraseYSpin + eraseXSpin + saturationSlider + gammaSlider + brightnessThresholdCheck + sharpenEnable + sharpenSigmaSlider + transformEnable + transformTypeCombo + cropTopPx + cropLeftPx + cropRightPx + cropBotPx + topBotCropSync + leftRightCropSync + magnifyEnable + rotateEnable + rotateAngleDial + puzzleEnable + puzzleRowsSpin + puzzleColsSpin + puzzleBlackSlotCheck + colorthresEnable + colorthresColorText + colorthresSaturationthresSlider + colorthresSimilaritythresSlider + invertEnable + extractEnable + extractComponentText + gradientEnable + gradientModeCombo + gradientTypeCheck + gradientCartoonCheck + waveEnable + rippleEnable + motionblurEnable + blurFactorSlider + motiondetectEnable + noiseEnable + psychedelicEnable + atmoEnable + atmoEdgeweightningSlider + atmoBrightnessSlider + atmoDarknesslimitSlider + atmoMeanlengthSlider + atmoMeanthresholdSlider + atmoPercentnewSlider + atmoFiltermodeCombo + atmoShowdotsCheck + wallEnable + wallRowsSpin + wallColsSpin + panoramixEnable + panoramixRowsSpin + panoramixColsSpin + marqEnable + marqMarqueeText + marqPositionCombo + cloneEnable + cloneCountSpin + brightnessSlider + contrastSlider + hueSlider + filtersResetButton + videoFilterText + filtersUpdateButton + subpictureFilterText + voutFilterText + adjustEnable + logoEnable + logoFileText + logoYSpin + logoXSpin + logoTransparencySlider + -- 2.39.2