← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/libs/dimg/filters/lc/localcontrastsettings.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/libs/dimg/filters/lc/localcontrastsettings.cpp
7
7
 * Description : Local Contrast settings view.
8
8
 *               LDR ToneMapper <http://zynaddsubfx.sourceforge.net/other/tonemapping>
9
9
 *
10
 
 * Copyright (C) 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
 
10
 * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
11
11
 *
12
12
 * This program is free software; you can redistribute it
13
13
 * and/or modify it under the terms of the GNU General
67
67
namespace Digikam
68
68
{
69
69
 
70
 
class LocalContrastSettingsPriv
 
70
class LocalContrastSettings::Private
71
71
{
72
72
 
73
73
public:
74
74
 
75
 
    LocalContrastSettingsPriv() :
 
75
    Private() :
76
76
        stretchContrastCheck(0),
77
77
        label4(0),
78
78
        label5(0),
141
141
 
142
142
    RExpanderBox*         expanderBox;
143
143
};
144
 
const QString LocalContrastSettingsPriv::configLowSaturationEntry("LowSaturation");
145
 
const QString LocalContrastSettingsPriv::configHighSaturationEntry("HighSaturation");
146
 
const QString LocalContrastSettingsPriv::configPower1Entry("Power1");
147
 
const QString LocalContrastSettingsPriv::configBlur1Entry("Blur1");
148
 
const QString LocalContrastSettingsPriv::configPower2Entry("Power2");
149
 
const QString LocalContrastSettingsPriv::configBlur2Entry("Blur2");
150
 
const QString LocalContrastSettingsPriv::configPower3Entry("Power3");
151
 
const QString LocalContrastSettingsPriv::configBlur3Entry("Blur3");
152
 
const QString LocalContrastSettingsPriv::configPower4Entry("Power4");
153
 
const QString LocalContrastSettingsPriv::configBlur4Entry("Blur4");
154
 
const QString LocalContrastSettingsPriv::configStretchContrastEntry("StretchContrast");
155
 
const QString LocalContrastSettingsPriv::configStageOneEntry("StageOne");
156
 
const QString LocalContrastSettingsPriv::configStageTwoEntry("StageTwo");
157
 
const QString LocalContrastSettingsPriv::configStageThreeEntry("StageThree");
158
 
const QString LocalContrastSettingsPriv::configStageFourEntry("StageFour");
159
 
const QString LocalContrastSettingsPriv::configFunctionInputEntry("FunctionInput");
 
144
 
 
145
const QString LocalContrastSettings::Private::configLowSaturationEntry("LowSaturation");
 
146
const QString LocalContrastSettings::Private::configHighSaturationEntry("HighSaturation");
 
147
const QString LocalContrastSettings::Private::configPower1Entry("Power1");
 
148
const QString LocalContrastSettings::Private::configBlur1Entry("Blur1");
 
149
const QString LocalContrastSettings::Private::configPower2Entry("Power2");
 
150
const QString LocalContrastSettings::Private::configBlur2Entry("Blur2");
 
151
const QString LocalContrastSettings::Private::configPower3Entry("Power3");
 
152
const QString LocalContrastSettings::Private::configBlur3Entry("Blur3");
 
153
const QString LocalContrastSettings::Private::configPower4Entry("Power4");
 
154
const QString LocalContrastSettings::Private::configBlur4Entry("Blur4");
 
155
const QString LocalContrastSettings::Private::configStretchContrastEntry("StretchContrast");
 
156
const QString LocalContrastSettings::Private::configStageOneEntry("StageOne");
 
157
const QString LocalContrastSettings::Private::configStageTwoEntry("StageTwo");
 
158
const QString LocalContrastSettings::Private::configStageThreeEntry("StageThree");
 
159
const QString LocalContrastSettings::Private::configStageFourEntry("StageFour");
 
160
const QString LocalContrastSettings::Private::configFunctionInputEntry("FunctionInput");
160
161
 
161
162
// --------------------------------------------------------
162
163
 
163
 
LocalContrastSettings::LocalContrastSettings(QWidget* parent)
 
164
LocalContrastSettings::LocalContrastSettings(QWidget* const parent)
164
165
    : QWidget(parent),
165
 
      d(new LocalContrastSettingsPriv)
 
166
      d(new Private)
166
167
{
167
168
    QGridLayout* grid = new QGridLayout(parent);
168
169
 
467
468
{
468
469
    LocalContrastContainer prm;
469
470
 
470
 
    prm.stretch_contrast = d->stretchContrastCheck->isChecked();
471
 
    prm.low_saturation   = d->lowSaturationInput->value();
472
 
    prm.high_saturation  = d->highSaturationInput->value();
473
 
    prm.function_id      = d->functionInput->currentIndex();
 
471
    prm.stretchContrast = d->stretchContrastCheck->isChecked();
 
472
    prm.lowSaturation   = d->lowSaturationInput->value();
 
473
    prm.highSaturation  = d->highSaturationInput->value();
 
474
    prm.functionId      = d->functionInput->currentIndex();
474
475
 
475
476
    prm.stage[0].enabled = d->expanderBox->isChecked(1);
476
477
    prm.stage[0].power   = d->powerInput1->value();
496
497
    blockSignals(true);
497
498
    d->expanderBox->setEnabled(false);
498
499
 
499
 
    d->stretchContrastCheck->setChecked(settings.stretch_contrast);
500
 
    d->lowSaturationInput->setValue(settings.low_saturation);
501
 
    d->highSaturationInput->setValue(settings.high_saturation);
502
 
    d->functionInput->setCurrentIndex(settings.function_id);
 
500
    d->stretchContrastCheck->setChecked(settings.stretchContrast);
 
501
    d->lowSaturationInput->setValue(settings.lowSaturation);
 
502
    d->highSaturationInput->setValue(settings.highSaturation);
 
503
    d->functionInput->setCurrentIndex(settings.functionId);
503
504
 
504
505
    d->expanderBox->setChecked(1, settings.stage[0].enabled);
505
506
    d->powerInput1->setValue(settings.stage[0].power);
517
518
    d->powerInput4->setValue(settings.stage[3].power);
518
519
    d->blurInput4->setValue(settings.stage[3].blur);
519
520
 
520
 
    /*
 
521
/*
521
522
    slotStage1Enabled(d->stageOne->isChecked());
522
523
    slotStage2Enabled(d->stageTwo->isChecked());
523
524
    slotStage3Enabled(d->stageThree->isChecked());
524
525
    slotStage4Enabled(d->stageFour->isChecked());
525
 
     */
 
526
*/
526
527
 
527
528
    d->expanderBox->setEnabled(true);
528
529
    blockSignals(false);
560
561
{
561
562
    LocalContrastContainer prm;
562
563
 
563
 
    prm.stretch_contrast = true;
564
 
    prm.low_saturation   = d->lowSaturationInput->defaultValue();
565
 
    prm.high_saturation  = d->highSaturationInput->defaultValue();
566
 
    prm.function_id      = d->functionInput->defaultIndex();
 
564
    prm.stretchContrast = true;
 
565
    prm.lowSaturation   = d->lowSaturationInput->defaultValue();
 
566
    prm.highSaturation  = d->highSaturationInput->defaultValue();
 
567
    prm.functionId      = d->functionInput->defaultIndex();
567
568
 
568
569
    prm.stage[0].enabled = true;
569
570
    prm.stage[0].power   = d->powerInput1->defaultValue();
589
590
    LocalContrastContainer prm;
590
591
    LocalContrastContainer defaultPrm = defaultSettings();
591
592
 
592
 
    prm.stretch_contrast = group.readEntry(d->configStretchContrastEntry, defaultPrm.stretch_contrast);
593
 
    prm.low_saturation   = group.readEntry(d->configLowSaturationEntry,   defaultPrm.low_saturation);
594
 
    prm.high_saturation  = group.readEntry(d->configHighSaturationEntry,  defaultPrm.high_saturation);
595
 
    prm.function_id      = group.readEntry(d->configFunctionInputEntry,   defaultPrm.function_id);
 
593
    prm.stretchContrast = group.readEntry(d->configStretchContrastEntry, defaultPrm.stretchContrast);
 
594
    prm.lowSaturation   = group.readEntry(d->configLowSaturationEntry,   defaultPrm.lowSaturation);
 
595
    prm.highSaturation  = group.readEntry(d->configHighSaturationEntry,  defaultPrm.highSaturation);
 
596
    prm.functionId      = group.readEntry(d->configFunctionInputEntry,   defaultPrm.functionId);
596
597
 
597
598
    prm.stage[0].enabled = group.readEntry(d->configStageOneEntry,        defaultPrm.stage[0].enabled);
598
599
    prm.stage[0].power   = group.readEntry(d->configPower1Entry,          defaultPrm.stage[0].power);
625
626
{
626
627
    LocalContrastContainer prm = settings();
627
628
 
628
 
    group.writeEntry(d->configStretchContrastEntry, prm.stretch_contrast);
629
 
    group.writeEntry(d->configLowSaturationEntry,   prm.low_saturation);
630
 
    group.writeEntry(d->configHighSaturationEntry,  prm.high_saturation);
631
 
    group.writeEntry(d->configFunctionInputEntry,   prm.function_id);
 
629
    group.writeEntry(d->configStretchContrastEntry, prm.stretchContrast);
 
630
    group.writeEntry(d->configLowSaturationEntry,   prm.lowSaturation);
 
631
    group.writeEntry(d->configHighSaturationEntry,  prm.highSaturation);
 
632
    group.writeEntry(d->configFunctionInputEntry,   prm.functionId);
632
633
 
633
634
    group.writeEntry(d->configStageOneEntry,        prm.stage[0].enabled);
634
635
    group.writeEntry(d->configPower1Entry,          prm.stage[0].power);