GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1062:b014e09f2329

Call the calculation of the thresholds in the scale editor (with each click on the 'automatic' mode)

Alexandre Leroux -

r1062:b014e09f2329

parent child

Context file:

r1062:b014e09f2329

Collapse all files

gui/src/Visualization/ColorScaleEditor.cpp +10 0

             #include "Visualization/ColorScaleEditor.h"
             #include "Visualization/SqpColorScale.h"
             #include "ui_ColorScaleEditor.h"
             namespace {
             const auto GRADIENTS = QVariantMap{{"Candy", QCPColorGradient::gpCandy},
                                                {"Cold", QCPColorGradient::gpCold},
                                                {"Geography", QCPColorGradient::gpGeography},
                                                {"Grayscale", QCPColorGradient::gpGrayscale},
                                                {"Hot", QCPColorGradient::gpHot},
                                                {"Hues", QCPColorGradient::gpHues},
                                                {"Ion", QCPColorGradient::gpIon},
                                                {"Jet", QCPColorGradient::gpJet},
                                                {"Night", QCPColorGradient::gpNight},
                                                {"Polar", QCPColorGradient::gpPolar},
                                                {"Spectrum", QCPColorGradient::gpSpectrum},
                                                {"Thermal", QCPColorGradient::gpThermal}};
             } // namespace
             ColorScaleEditor::ColorScaleEditor(SqpColorScale &scale, QWidget *parent)
                     : QDialog{parent},
                       ui{new Ui::ColorScaleEditor},
                       m_ThresholdGroup{new QButtonGroup{this}},
                       m_Scale{scale}
             {
                 ui->setupUi(this);
                 // Inits gradient combobox content
                 for (auto it = GRADIENTS.begin(), end = GRADIENTS.end(); it != end; ++it) {
                     ui->gradientComboBox->addItem(it.key(), it.value());
                 }
                 // Creates threshold group
                 m_ThresholdGroup->addButton(ui->thresholdAutoButton);
                 m_ThresholdGroup->addButton(ui->thresholdManualButton);
                 // Inits min/max spinboxes' properties
                 auto setSpinBoxProperties = [](auto &spinBox) {
                     spinBox.setDecimals(3);
                     spinBox.setMinimum(-std::numeric_limits<double>::max());
                     spinBox.setMaximum(std::numeric_limits<double>::max());
                 };
                 setSpinBoxProperties(*ui->minSpinBox);
                 setSpinBoxProperties(*ui->maxSpinBox);
                 // Creates color scale preview
                 m_PreviewScale = new QCPColorScale{ui->plot};
                 m_PreviewScale->setType(QCPAxis::atTop);
                 m_PreviewScale->setMinimumMargins(QMargins{5, 5, 5, 5});
                 m_PreviewScale->axis()->setScaleType(QCPAxis::stLogarithmic);
                 m_PreviewScale->axis()->setNumberPrecision(0);
                 m_PreviewScale->axis()->setNumberFormat("eb");
                 m_PreviewScale->axis()->setTicker(QSharedPointer<QCPAxisTickerLog>::create());
                 m_PreviewScale->setGradient(QCPColorGradient{QCPColorGradient::gpJet});
                 ui->plot->plotLayout()->clear();
                 ui->plot->plotLayout()->insertRow(0);
                 ui->plot->plotLayout()->addElement(0, 0, m_PreviewScale);
                 // Inits connections
                 connect(ui->gradientComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePreview()));
                 connect(ui->thresholdAutoButton, SIGNAL(toggled(bool)), this, SLOT(onThresholdChanged(bool)));
                 connect(ui->thresholdManualButton, SIGNAL(toggled(bool)), this, SLOT(onThresholdChanged(bool)));
                 connect(ui->minSpinBox, SIGNAL(editingFinished()), this, SLOT(onMinChanged()));
                 connect(ui->maxSpinBox, SIGNAL(editingFinished()), this, SLOT(onMaxChanged()));
                 // OK/cancel buttons
                 connect(ui->okButton, SIGNAL(clicked(bool)), this, SLOT(accept()));
                 connect(ui->cancelButton, SIGNAL(clicked(bool)), this, SLOT(reject()));
                 // Loads color scale
                 loadScale();
             }
             ColorScaleEditor::~ColorScaleEditor() noexcept
             {
                 delete ui;
             }
             void ColorScaleEditor::loadScale()
             {
                 // Gradient
                 auto gradientPresetIndex = ui->gradientComboBox->findData(m_Scale.m_GradientPreset);
                 ui->gradientComboBox->setCurrentIndex(gradientPresetIndex);
                 // Threshold mode
                 (m_Scale.m_AutomaticThreshold ? ui->thresholdAutoButton : ui->thresholdManualButton)
                     ->setChecked(true);
                 // Min/max
                 auto qcpColorScale = m_Scale.m_Scale;
                 auto range = qcpColorScale->dataRange();
                 ui->minSpinBox->setValue(range.lower);
                 ui->maxSpinBox->setValue(range.upper);
                 updatePreview();
             }
             void ColorScaleEditor::saveScale()
             {
                 auto qcpColorScale = m_Scale.m_Scale;
                 // Gradient
                 auto gradientPreset
                     = ui->gradientComboBox->currentData().value<QCPColorGradient::GradientPreset>();
                 qcpColorScale->setGradient(gradientPreset);
                 m_Scale.m_GradientPreset = gradientPreset;
                 // Threshold mode
                 m_Scale.m_AutomaticThreshold = ui->thresholdAutoButton->isChecked();
                 // Min/max
                 qcpColorScale->setDataRange(QCPRange{ui->minSpinBox->value(), ui->maxSpinBox->value()});
             }
             void ColorScaleEditor::accept()
             {
                 saveScale();
                 QDialog::accept();
             }
             void ColorScaleEditor::onMaxChanged()
             {
                 // Ensures that max >= min
                 auto maxValue = ui->maxSpinBox->value();
                 if (maxValue < ui->minSpinBox->value()) {
                     ui->minSpinBox->setValue(maxValue);
                 }
                 updatePreview();
             }
             void ColorScaleEditor::onMinChanged()
             {
                 // Ensures that min <= max
                 auto minValue = ui->minSpinBox->value();
                 if (minValue > ui->maxSpinBox->value()) {
                     ui->maxSpinBox->setValue(minValue);
                 }
                 updatePreview();
             }
             void ColorScaleEditor::onThresholdChanged(bool checked)
             {
                 if (checked) {
                     auto isAutomatic = ui->thresholdAutoButton == m_ThresholdGroup->checkedButton();
                     ui->minSpinBox->setEnabled(!isAutomatic);
                     ui->maxSpinBox->setEnabled(!isAutomatic);
+                    // Computes automatic thresholds
+                    if (isAutomatic) {
+                        double minThreshold, maxThreshold;
+                        std::tie(minThreshold, maxThreshold) = SqpColorScale::computeThresholds(m_Scale);
+                        ui->minSpinBox->setValue(minThreshold);
+                        ui->maxSpinBox->setValue(maxThreshold);
+                        updatePreview();
+                    }
                 }
             }
             void ColorScaleEditor::updatePreview()
             {
                 m_PreviewScale->setDataRange(QCPRange{ui->minSpinBox->value(), ui->maxSpinBox->value()});
                 m_PreviewScale->setGradient(
                     ui->gradientComboBox->currentData().value<QCPColorGradient::GradientPreset>());
                 ui->plot->replot();
             }

gui/ui/Visualization/ColorScaleEditor.ui +2 -8

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>ColorScaleEditor</class>
              <widget class="QDialog" name="ColorScaleEditor">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>258</width>
                 <height>232</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Color scale editor</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
                <item row="3" column="0">
                 <layout class="QHBoxLayout" name="horizontalLayout">
                  <item>
                   <spacer name="horizontalSpacer">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
                      <width>40</width>
                      <height>20</height>
                     </size>
                    </property>
                   </spacer>
                  </item>
                  <item>
                   <widget class="QPushButton" name="okButton">
                    <property name="text">
                     <string>OK</string>
                    </property>
-                   <property name="default">
-                    <bool>true</bool>
-                   </property>
                   </widget>
                  </item>
                  <item>
                   <widget class="QPushButton" name="cancelButton">
                    <property name="text">
                     <string>Cancel</string>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </item>
                <item row="1" column="0">
                 <widget class="QGroupBox" name="groupBox">
                  <property name="title">
                   <string>Preview</string>
                  </property>
                  <layout class="QGridLayout" name="gridLayout_3">
                   <item row="0" column="0">
                    <widget class="QCustomPlot" name="plot" native="true"/>
                   </item>
                  </layout>
                 </widget>
                </item>
                <item row="0" column="0">
                 <layout class="QGridLayout" name="gridLayout_2">
                  <item row="1" column="0">
                   <widget class="QLabel" name="thresholdLabel">
                    <property name="text">
                     <string>Thresholds:</string>
                    </property>
                   </widget>
                  </item>
                  <item row="1" column="1">
                   <widget class="QRadioButton" name="thresholdAutoButton">
-                   <property name="enabled">
-                    <bool>false</bool>
-                   </property>
                    <property name="text">
                     <string>Automatic</string>
                    </property>
                    <property name="checkable">
                     <bool>true</bool>
                    </property>
                    <property name="checked">
                     <bool>false</bool>
                    </property>
                   </widget>
                  </item>
                  <item row="1" column="2">
                   <widget class="QRadioButton" name="thresholdManualButton">
                    <property name="text">
                     <string>Manual</string>
                    </property>
                   </widget>
                  </item>
                  <item row="2" column="0">
                   <widget class="QLabel" name="minLabel">
                    <property name="text">
                     <string>Min:</string>
                    </property>
                   </widget>
                  </item>
                  <item row="3" column="0">
                   <widget class="QLabel" name="maxLabel">
                    <property name="text">
                     <string>Max:</string>
                    </property>
                   </widget>
                  </item>
                  <item row="2" column="1" colspan="2">
                   <widget class="QDoubleSpinBox" name="minSpinBox">
                    <property name="showGroupSeparator" stdset="0">
                     <bool>true</bool>
                    </property>
                   </widget>
                  </item>
                  <item row="3" column="1" colspan="2">
                   <widget class="QDoubleSpinBox" name="maxSpinBox">
                    <property name="showGroupSeparator" stdset="0">
                     <bool>true</bool>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="0">
                   <widget class="QLabel" name="gradientLabel">
                    <property name="text">
                     <string>Gradient:</string>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1" colspan="2">
                   <widget class="QComboBox" name="gradientComboBox"/>
                  </item>
                 </layout>
                </item>
                <item row="2" column="0">
                 <spacer name="verticalSpacer">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
                    <height>40</height>
                   </size>
                  </property>
                 </spacer>
                </item>
               </layout>
              </widget>
              <customwidgets>
               <customwidget>
                <class>QCustomPlot</class>
                <extends>QWidget</extends>
                <header>Visualization/qcustomplot.h</header>
                <container>1</container>
               </customwidget>
              </customwidgets>
              <tabstops>
               <tabstop>gradientComboBox</tabstop>
               <tabstop>thresholdAutoButton</tabstop>
-              <tabstop>okButton</tabstop>
               <tabstop>thresholdManualButton</tabstop>
-              <tabstop>maxSpinBox</tabstop>
               <tabstop>minSpinBox</tabstop>
+              <tabstop>maxSpinBox</tabstop>
+              <tabstop>okButton</tabstop>
               <tabstop>cancelButton</tabstop>
              </tabstops>
              <resources/>
              <connections/>
             </ui>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages