[Git][freetype/freetype-demos][gsoc-2022-chariri-3] [ftinspect] Improve

Charlie Jiang pushed to branch gsoc-2022-chariri-3 at FreeType / FreeType Demo Programs

Commits:

8727ed6d

by Charlie Jiang at 2022-08-23T23:17:02+08:00

[ftinspect] Improve MM/GX handling.

Add individual reset default button for all axes. Use an edit box for the
axis value. Add very rudimentary support for grouping.

* src/ftinspect/panels/settingpanelmmgx.cpp,
  src/ftinspect/panels/settingpanelmmgx.hpp: As described.

* src/ftinspect/panels/continuous.cpp, src/ftinspect/panels/continuous.hpp:
  Block signal from the size selector when font reloads to prevent flashing.
  Prevent unnecessary repainting to prevent flashing.

* src/ftinspect/panels/comparator.cpp, src/ftinspect/panels/singular.cpp:
  Block signal from the size selector when font reloads to prevent flashing.

* src/ftinspect/maingui.cpp: Change fixed width for the left panel to 400..

7 changed files:

src/ftinspect/maingui.cpp
src/ftinspect/panels/comparator.cpp
src/ftinspect/panels/continuous.cpp
src/ftinspect/panels/continuous.hpp
src/ftinspect/panels/settingpanelmmgx.cpp
src/ftinspect/panels/settingpanelmmgx.hpp
src/ftinspect/panels/singular.cpp

Changes:

src/ftinspect/maingui.cpp

@@ -243,13 +243,7 @@ MainGUI::createLayout()
    // to change the policy we have to use a widget wrapper
    leftWidget_ = new QWidget(this);
    leftWidget_->setLayout(leftLayout_);
+-
 -  QSizePolicy leftWidgetPolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
 -  leftWidgetPolicy.setHorizontalStretch(0);
 -  leftWidgetPolicy.setVerticalPolicy(leftWidget_->sizePolicy().verticalPolicy());
 -  leftWidgetPolicy.setHeightForWidth(leftWidget_->sizePolicy().hasHeightForWidth());
+-
 -  leftWidget_->setSizePolicy(leftWidgetPolicy);
 +  leftWidget_->setFixedWidth(400);
    // right side
    singularTab_ = new SingularTab(this, engine_);

src/ftinspect/panels/comparator.cpp

@@ -49,7 +49,10 @@ ComperatorTab::repaintGlyph()
  void
  ComperatorTab::reloadFont()
+ {
 -  sizeSelector_->reloadFromFont(engine_);
 +  {
 +    QSignalBlocker blocker(sizeSelector_);
 +    sizeSelector_->reloadFromFont(engine_);
 +  }
    charMapSelector_->repopulate();
    for (auto panel : settingPanels_)
      panel->onFontChanged();

src/ftinspect/panels/continuous.cpp

@@ -47,7 +47,10 @@ void
  ContinuousTab::reloadFont()
+ {
    currentGlyphCount_ = engine_->currentFontNumberOfGlyphs();
 -  sizeSelector_->reloadFromFont(engine_);
 +  {
 +    QSignalBlocker blocker(sizeSelector_);
 +    sizeSelector_->reloadFromFont(engine_);
 +  }
    setGlyphCount(qBound(0, currentGlyphCount_, INT_MAX));
    checkModeSource();
@@ -168,7 +171,13 @@ ContinuousTab::checkModeSource()
    waterfallConfigButton_->setEnabled(waterfallCheckBox_->isChecked()
                                       && !engine_->currentFontBitmapOnly());
 +}
++
 +void
 +ContinuousTab::checkModeSourceAndRepaint()
 +{
 +  checkModeSource();
    repaintGlyph();
+ }
@@ -420,14 +429,14 @@ ContinuousTab::createConnections()
    connect(indexSelector_, &GlyphIndexSelector::currentIndexChanged,
            this, &ContinuousTab::repaintGlyph);
    connect(modeSelector_, QOverload<int>::of(&QComboBox::currentIndexChanged),
 -          this, &ContinuousTab::checkModeSource);
 +          this, &ContinuousTab::checkModeSourceAndRepaint);
    connect(charMapSelector_,
            QOverload<int>::of(&CharMapComboBox::currentIndexChanged),
            this, &ContinuousTab::charMapChanged);
    connect(charMapSelector_, &CharMapComboBox::forceUpdateLimitIndex,
            this, &ContinuousTab::updateLimitIndex);
    connect(sourceSelector_, QOverload<int>::of(&QComboBox::currentIndexChanged),
 -          this, &ContinuousTab::checkModeSource);
 +          this, &ContinuousTab::checkModeSourceAndRepaint);
    connect(resetPositionButton_, &QPushButton::clicked,
            canvas_, &GlyphContinuous::resetPositionDelta);
@@ -453,9 +462,9 @@ ContinuousTab::createConnections()
            this, &ContinuousTab::repaintGlyph);
    connect(waterfallCheckBox_, &QCheckBox::clicked,
 -          this, &ContinuousTab::checkModeSource);
 +          this, &ContinuousTab::checkModeSourceAndRepaint);
    connect(verticalCheckBox_, &QCheckBox::clicked,
 -          this, &ContinuousTab::checkModeSource);
 +          this, &ContinuousTab::checkModeSourceAndRepaint);
    connect(kerningCheckBox_, &QCheckBox::clicked,
            this, &ContinuousTab::reloadGlyphsAndRepaint);
    connect(sourceTextEdit_, &QPlainTextEdit::textChanged,

src/ftinspect/panels/continuous.hpp

@@ -50,9 +50,10 @@ public:
    // This doesn't trigger either.
    void updateLimitIndex();
 +  void checkModeSource();
    // But they do
 -  void checkModeSource();
 +  void checkModeSourceAndRepaint();
    void charMapChanged();
    void sourceTextChanged();
    void presetStringSelected();

src/ftinspect/panels/settingpanelmmgx.cpp

@@ -7,6 +7,7 @@
  #include <QScrollBar>
  #include "../engine/engine.hpp"
 +#include "../uihelper.hpp"
  SettingPanelMMGX::SettingPanelMMGX(QWidget* parent,
                                     Engine* engine)
@@ -56,10 +57,15 @@ SettingPanelMMGX::reloadFont()
        w->updateInfo(currentAxes_[i]);
        listLayout_->addWidget(w);
        connect(w, &MMGXSettingItem::valueChanged,
 -              this, &SettingPanelMMGX::itemChanged);
 +              [this, index = i]
 +              {
 +                itemChanged(index);
 +              });
+     }
+   }
    checkHidden();
 +  retrieveValues();
 +  syncSettings();
+ }
@@ -87,19 +93,20 @@ void
  SettingPanelMMGX::createLayout()
+ {
    showHiddenCheckBox_ = new QCheckBox(tr("Show Hidden"), this);
 +  groupingCheckBox_ = new QCheckBox(tr("Grouping"), this);
    resetDefaultButton_ = new QPushButton(tr("Reset Default"), this);
    itemsListWidget_ = new QWidget(this);
    scrollArea_ = new UnboundScrollArea(this);
    scrollArea_->setWidget(itemsListWidget_);
    scrollArea_->setWidgetResizable(true);
 -  scrollArea_->setStyleSheet("QScrollArea {background-color:transparent;}");
 -  itemsListWidget_->setStyleSheet("background-color:transparent;");
 +  itemsListWidget_->setAutoFillBackground(false);
    mainLayout_ = new QVBoxLayout;
    listLayout_ = new QVBoxLayout;
    listWrapperLayout_ = new QVBoxLayout;
 +  listLayout_->setSpacing(0);
    listLayout_->setContentsMargins(0, 0, 0, 0);
    itemsListWidget_->setContentsMargins(0, 0, 0, 0);
@@ -109,6 +116,7 @@ SettingPanelMMGX::createLayout()
    listWrapperLayout_->addStretch(1);
    mainLayout_->addWidget(showHiddenCheckBox_);
 +  mainLayout_->addWidget(groupingCheckBox_);
    mainLayout_->addWidget(resetDefaultButton_);
    mainLayout_->addWidget(scrollArea_, 1);
@@ -123,16 +131,34 @@ SettingPanelMMGX::createConnections()
            this, &SettingPanelMMGX::checkHidden);
    connect(resetDefaultButton_, &QCheckBox::clicked,
            this, &SettingPanelMMGX::resetDefaultClicked);
 +  connect(groupingCheckBox_, &QCheckBox::clicked,
 +          this, &SettingPanelMMGX::checkGrouping);
+ }
  void
 -SettingPanelMMGX::itemChanged()
 +SettingPanelMMGX::retrieveValues()
+ {
    currentValues_.resize(currentAxes_.size());
    for (unsigned i = 0; i < currentAxes_.size(); ++i)
      currentValues_[i] = itemWidgets_[i]->value();
 +}
++
++
 +void
 +SettingPanelMMGX::itemChanged(size_t index)
 +{
 +  if (groupingCheckBox_->isChecked()
 +      && index < currentAxes_.size() && index < itemWidgets_.size())
 +  {
 +    auto tag = currentAxes_[index].tag;
 +    auto value = itemWidgets_[index]->value();
 +    for (size_t i = 0; i < itemWidgets_.size(); ++i)
 +      if (i != index && currentAxes_[i].tag == tag)
 +        itemWidgets_[i]->setValue(value);
 +  }
 +  retrieveValues();
    emit mmgxCoordsChanged();
+ }
@@ -142,7 +168,35 @@ SettingPanelMMGX::resetDefaultClicked()
+ {
    for (auto w : itemWidgets_)
      w->resetDefault();
 -  itemChanged();
++
 +  retrieveValues();
 +  emit mmgxCoordsChanged();
 +}
++
++
 +void
 +SettingPanelMMGX::checkGrouping()
 +{
 +  if (!groupingCheckBox_->isChecked())
 +    return;
 +  auto maxIndex = std::max(itemWidgets_.size(), currentAxes_.size());
 +  for (size_t i = maxIndex - 1; ; --i)
 +  {
 +    if (!currentAxes_[i].hidden)
 +    {
 +      auto tag = currentAxes_[i].tag;
 +      auto value = itemWidgets_[i]->value();
 +      for (size_t j = 0; j < maxIndex; ++j)
 +        if (j != i && currentAxes_[j].tag == tag)
 +          itemWidgets_[j]->setValue(value);
 +    }
++
 +    if (i == 0)
 +      break;
 +  }
++
 +  retrieveValues();
 +  emit mmgxCoordsChanged();
+ }
@@ -158,6 +212,8 @@ void
  MMGXSettingItem::updateInfo(MMGXAxisInfo& info)
+ {
    axisInfo_ = info;
 +  valueValidator_->setRange(info.minimum, info.maximum, 10);
++
    if (info.hidden)
      nameLabel_->setText("<i>" + info.name + "</i>");
    else
@@ -174,13 +230,19 @@ MMGXSettingItem::updateInfo(MMGXAxisInfo& info)
+ }
 +void
 +MMGXSettingItem::setValue(FT_Fixed value)
 +{
 +  actualValue_ = value;
 +  updateSlider();
 +  updateLineEdit();
 +}
++
++
  void
  MMGXSettingItem::resetDefault()
+ {
 -  QSignalBlocker blocker(this);
 -  slider_->setValue(static_cast<int>((axisInfo_.def - axisInfo_.minimum)
 -                                     / (axisInfo_.maximum - axisInfo_.minimum)
 -                                     * 1024));
 +  setValue(static_cast<FT_Fixed>(axisInfo_.def * 65536.0));
+ }
@@ -188,18 +250,31 @@ void
  MMGXSettingItem::createLayout()
+ {
    nameLabel_ = new QLabel(this);
 -  valueLabel_ = new QLabel(this);
++
 +  // 1/1024 = 0.0009765625
 +  valueValidator_ = new QDoubleValidator(0, 0, 10, this);
 +  valueValidator_->setNotation(QDoubleValidator::StandardNotation);
++
 +  valueLineEdit_ = new QLineEdit("0", this);
 +  valueLineEdit_->setValidator(valueValidator_);
++
    slider_ = new QSlider(this);
    slider_->setOrientation(Qt::Horizontal);
 +  resetDefaultButton_ = new QPushButton(this);
 +  resetDefaultButton_->setText(tr("Def"));
 +  setButtonNarrowest(resetDefaultButton_);
++
    mainLayout_ = new QGridLayout();
 -  mainLayout_->addWidget(nameLabel_, 0, 0);
 -  mainLayout_->addWidget(valueLabel_, 0, 1, 1, 1, Qt::AlignRight);
 +  mainLayout_->addWidget(nameLabel_, 0, 0, 1, 2);
    mainLayout_->addWidget(slider_, 1, 0, 1, 2);
 +  mainLayout_->addWidget(valueLineEdit_, 2, 0, 1, 1, Qt::AlignVCenter);
 +  mainLayout_->addWidget(resetDefaultButton_, 2, 1, 1, 1, Qt::AlignVCenter);
 +  mainLayout_->setSpacing(4);
    mainLayout_->setContentsMargins(4, 4, 4, 4);
 -  setContentsMargins(4, 4, 4, 4);
 +  setContentsMargins(0, 0, 0, 0);
    setLayout(mainLayout_);
    setFrameShape(StyledPanel);
+ }
@@ -210,6 +285,10 @@ MMGXSettingItem::createConnections()
+ {
    connect(slider_, &QSlider::valueChanged,
            this, &MMGXSettingItem::sliderValueChanged);
 +  connect(valueLineEdit_, &QLineEdit::editingFinished,
 +          this, &MMGXSettingItem::lineEditChanged);
 +  connect(resetDefaultButton_, &QToolButton::clicked,
 +          this, &MMGXSettingItem::resetDefaultSingle);
+ }
@@ -223,19 +302,53 @@ MMGXSettingItem::sliderValueChanged()
    if (axisInfo_.isMM)
      actualValue_ = FT_RoundFix(actualValue_);
 -  else
 -  {
 -    double x = actualValue_ / 65536.0 * 100.0;
 -    x += x < 0.0 ? -0.5 : 0.5;
 -    x = static_cast<int>(x);
 -    x = x / 100.0 * 65536.0;
 -    x += x < 0.0 ? -0.5 : 0.5;
 -    actualValue_ = static_cast<FT_Fixed>(x);
 +  updateLineEdit();
 +  emit valueChanged();
 +}
++
++
 +void
 +MMGXSettingItem::lineEditChanged()
 +{
 +  bool succ = false;
 +  auto newValue = valueLineEdit_->text().toDouble(&succ);
 +  if (!succ || newValue > axisInfo_.maximum || newValue < axisInfo_.minimum)
 +  {
 +    updateLineEdit();
 +    return;
+   }
 -  valueLabel_->setText(QString::number(actualValue_ / 65536.0));
 +  actualValue_ = static_cast<FT_Fixed>(newValue / 65536.0);
++
 +  updateSlider();
 +  emit valueChanged();
 +}
++
 +void
 +MMGXSettingItem::updateLineEdit()
 +{
 +  QSignalBlocker blocker(valueLineEdit_);
 +  valueLineEdit_->setText(QString::number(actualValue_ / 65536.0));
 +}
++
++
 +void
 +MMGXSettingItem::updateSlider()
 +{
 +  QSignalBlocker blocker(slider_);
 +  slider_->setValue(
 +    static_cast<int>((actualValue_ / 65536.0 - axisInfo_.minimum)
 +                     / (axisInfo_.maximum - axisInfo_.minimum)
 +                     * 1024));
 +}
++
++
 +void
 +MMGXSettingItem::resetDefaultSingle()
 +{
 +  resetDefault();
    emit valueChanged();
+ }

src/ftinspect/panels/settingpanelmmgx.hpp

@@ -12,9 +12,13 @@
  #include <QBoxLayout>
  #include <QCheckBox>
  #include <QScrollArea>
 +#include <QLineEdit>
  #include <QSlider>
  #include <QFrame>
 +#include <QPushButton>
 +#include <QToolButton>
  #include <QLabel>
 +#include <QDoubleValidator>
  #include <freetype/fttypes.h>
@@ -41,6 +45,7 @@ private:
    Engine* engine_;
    QCheckBox* showHiddenCheckBox_;
 +  QCheckBox* groupingCheckBox_;
    QPushButton* resetDefaultButton_;
    QWidget* itemsListWidget_;
    UnboundScrollArea* scrollArea_;
@@ -56,8 +61,10 @@ private:
    void createLayout();
    void createConnections();
 -  void itemChanged();
 +  void retrieveValues();
 +  void itemChanged(size_t index);
    void resetDefaultClicked();
 +  void checkGrouping();
  };
@@ -71,6 +78,7 @@ public:
    void updateInfo(MMGXAxisInfo& info);
    FT_Fixed value() { return actualValue_; }
 +  void setValue(FT_Fixed value);
    void resetDefault();
  signals:
@@ -78,8 +86,10 @@ signals:
  private:
    QLabel* nameLabel_;
 -  QLabel* valueLabel_;
    QSlider* slider_;
 +  QPushButton* resetDefaultButton_;
 +  QLineEdit* valueLineEdit_;
 +  QDoubleValidator* valueValidator_;
    QGridLayout* mainLayout_;
@@ -89,6 +99,10 @@ private:
    void createLayout();
    void createConnections();
    void sliderValueChanged();
 +  void lineEditChanged();
 +  void updateLineEdit();
 +  void updateSlider();
 +  void resetDefaultSingle();
  };

src/ftinspect/panels/singular.cpp

@@ -409,7 +409,10 @@ SingularTab::reloadFont()
+ {
    currentGlyphCount_ = engine_->currentFontNumberOfGlyphs();
    indexSelector_->setMinMax(0, currentGlyphCount_);
 -  sizeSelector_->reloadFromFont(engine_);
 +  {
 +    QSignalBlocker blocker(sizeSelector_);
 +    sizeSelector_->reloadFromFont(engine_);
 +  }
    drawGlyph();
+ }

From:	Charlie Jiang (@cqjjjzr)
Subject:	[Git][freetype/freetype-demos][gsoc-2022-chariri-3] [ftinspect] Improve MM/GX handling.
Date:	Tue, 23 Aug 2022 15:17:20 +0000