[Git][freetype/freetype-demos][gsoc-2022-chariri-final] 2 commits: [ftin

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

Commits:

721eab6f

by Charlie Jiang at 2022-09-02T21:18:01+08:00

[ftinspect] WIP: Rewrite `MainGUI`.

Note: This commit doesn't compile. This change is splitted into 2 commits
to avoid a complicated diff.

* src/ftinspect/maingui.cpp, src/ftinspect/maingui.hpp: Old version removed.

665ae2ef

by Charlie Jiang at 2022-09-03T22:10:51+08:00

[ftinspect] Rewrite `MainGUI`.

Note: This commit compiles, but the main view is removed, so you will get a
blank right panel. The singular view will be added back with major changes
in the next commit.

This commit mainly introduces below changes:

1. The original `MainGUI` contains almost all GUI elements. Most of them are
   taken out to modular components. The current `MainGUI` serves only as
   a skeleton provides coordinate between components, greatly shortened.
   It also provides some auxiliary code such as calling to file chooser.
2. The left panel is moved to `SettingPanel` class. The current
   `settingpanel.[ch]pp` are directly modified from the latest code, so they
   contains some options not implemented in the `Engine`.
   Structural code that is only added accompanying later change is removed,
   such as the comparator mode. Such code will be added back with the
   related feature. However, code for unimplemented options are simply
   commented out.
3. The main part is transformed into a tabbed view. The original code is
   removed. Refactored, it will be added back in the next commit.
4. The navigation buttons (Next/Prev Font/Face/NI) are changed into the new
   triplet-selector, which is a major UI improvement.

* src/ftinspect/maingui.cpp, src/ftinspect/maingui.hpp: As described.

* src/ftinspect/panels/abstracttab.hpp: Add `AbstractTab` which is an
  interface for all tabs listening for font reloading and repainting.

* src/ftinspect/panels/settingpanel.cpp,
  src/ftinspect/panels/settingpanel.hpp:
  As described, this is the left panel. This requires intensive reviewing
  since many bugs had rooted here.

* src/ftinspect/widgets/tripletselector.cpp,
  src/ftinspect/widgets/tripletselector.hpp:
  As described, this is the triplet (Font/Subface/NI) selector.
  This component is also responsible for repopulating triplet information
  and keep up with the font file change (i.e. the
  `FontFileManager::currentFileChanged` event is captured here).

* src/ftinspect/engine/engine.cpp, src/ftinspect/engine/engine.hpp:
  Add `fontValid` and `namedInstanceName` since `TripletSelector` requires
  them. However, they'll subject to change later.

* src/ftinspect/ftinspect.cpp: Remove call to `MainGUI::setDefaults`.

* src/ftinspect/CMakeLists.txt, src/ftinspect/meson.build: Updated.

12 changed files:

src/ftinspect/CMakeLists.txt
src/ftinspect/engine/engine.cpp
src/ftinspect/engine/engine.hpp
src/ftinspect/ftinspect.cpp
src/ftinspect/maingui.cpp
src/ftinspect/maingui.hpp
src/ftinspect/meson.build
+ src/ftinspect/panels/abstracttab.hpp
+ src/ftinspect/panels/settingpanel.cpp
+ src/ftinspect/panels/settingpanel.hpp
+ src/ftinspect/widgets/tripletselector.cpp
+ src/ftinspect/widgets/tripletselector.hpp

Changes:

src/ftinspect/CMakeLists.txt

@@ -30,8 +30,11 @@ add_executable(ftinspect
    "glyphcomponents/grid.cpp"
    "widgets/customwidgets.cpp"
 +  "widgets/tripletselector.cpp"
    "models/customcomboboxmodels.cpp"
++
 +  "panels/settingpanel.cpp"
+ )
  target_link_libraries(ftinspect
    Qt5::Core Qt5::Widgets

src/ftinspect/engine/engine.cpp

@@ -237,6 +237,50 @@ Engine::numberOfNamedInstances(int fontIndex,
+ }
 +QString
 +Engine::namedInstanceName(int fontIndex, long faceIndex, int index)
 +{
 +  if (fontIndex < 0)
 +    return {};
++
 +  FT_Face face;
 +  QString name;
++
 +  // search triplet (fontIndex, faceIndex, index)
 +  FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>
 +                           (faceIDMap_.value(FaceID(fontIndex,
 +                                                    faceIndex,
 +                                                    index)));
 +  if (ftcFaceID)
 +  {
 +    // found
 +    if (!FTC_Manager_LookupFace(cacheManager_, ftcFaceID, &face))
 +      name = QString("%1 %2")
 +               .arg(face->family_name)
 +               .arg(face->style_name);
 +  }
 +  else
 +  {
 +    // not found; try to load triplet (fontIndex, faceIndex, index)
 +    ftcFaceID = reinterpret_cast<FTC_FaceID>(faceCounter_);
 +    faceIDMap_.insert(FaceID(fontIndex, faceIndex, index),
 +                      faceCounter_++);
++
 +    if (!FTC_Manager_LookupFace(cacheManager_, ftcFaceID, &face))
 +      name = QString("%1 %2")
 +               .arg(face->family_name)
 +               .arg(face->style_name);
 +    else
 +    {
 +      faceIDMap_.remove(FaceID(fontIndex, faceIndex, 0));
 +      faceCounter_--;
 +    }
 +  }
++
 +  return name;
 +}
++
++
  int
  Engine::loadFont(int fontIndex,
                   long faceIndex,
@@ -394,6 +438,14 @@ Engine::numberOfOpenedFonts()
+ }
 +bool
 +Engine::fontValid()
 +{
 +  // TODO: use fallback font
 +  return ftSize_ != NULL;
 +}
++
++
  void
  Engine::openFonts(QStringList fontFileNames)
+ {

src/ftinspect/engine/engine.hpp

@@ -85,6 +85,7 @@ public:
    int numberOfOpenedFonts();
    // (for current fonts)
 +  bool fontValid();
    int currentFontType() const { return fontType_; }
    const QString& currentFamilyName() { return curFamilyName_; }
    const QString& currentStyleName() { return curStyleName_; }
@@ -92,6 +93,7 @@ public:
    long numberOfFaces(int fontIndex);
    int numberOfNamedInstances(int fontIndex,
                               long faceIndex);
 +  QString namedInstanceName(int fontIndex, long faceIndex, int index);
    //////// Setters (direct or indirect)

src/ftinspect/ftinspect.cpp

@@ -23,7 +23,6 @@ main(int argc,
    Engine engine;
    MainGUI gui(&engine);
 -  gui.setDefaults();
    gui.show();

src/ftinspect/maingui.cpp

@@ -4,30 +4,27 @@
  #include "maingui.hpp"
 -#include "glyphcomponents/grid.hpp"
 -#include "uihelper.hpp"
  #include <QApplication>
  #include <QFileDialog>
  #include <QMessageBox>
  #include <QSettings>
+-
 -#include <freetype/ftdriver.h>
 +#include <QScrollBar>
 +#include <QStatusBar>
  MainGUI::MainGUI(Engine* engine)
  : engine_(engine)
+ {
 -  setGraphicsDefaults();
    createLayout();
    createConnections();
    createActions();
    createMenus();
 -  createStatusBar();
    readSettings();
+-
    setUnifiedTitleAndToolBarOnMac(true);
++
 +  show();
+ }
@@ -47,6 +44,15 @@ MainGUI::closeEvent(QCloseEvent* event)
+ }
 +void
 +MainGUI::keyPressEvent(QKeyEvent* event)
 +{
 +  // Delegate key events to tabs
 +  if (!tabWidget_->currentWidget()->eventFilter(this, event))
 +    QMainWindow::keyPressEvent(event);
 +}
++
++
  void
  MainGUI::about()
+ {
@@ -81,8 +87,6 @@ MainGUI::aboutQt()
  void
  MainGUI::loadFonts()
+ {
 -  int oldSize = engine_->numberOfOpenedFonts();
+-
    QStringList files = QFileDialog::getOpenFileNames(
                          this,
                          tr("Load one or more fonts"),
@@ -90,630 +94,60 @@ MainGUI::loadFonts()
                          "",
                          NULL,
                          QFileDialog::ReadOnly);
+-
 -  engine_->openFonts(files);
+-
 -  // if we have new fonts, set the current index to the first new one
 -  if (oldSize < engine_->numberOfOpenedFonts())
 -    currentFontIndex_ = oldSize;
+-
 -  showFont();
 -}
+-
+-
 -void
 -MainGUI::closeFont()
 -{
 -  if (currentFontIndex_ < engine_->numberOfOpenedFonts())
 -  {
 -    engine_->removeFont(currentFontIndex_);
 -  }
+-
 -  // show next font after deletion, i.e., retain index if possible
 -  int num = engine_->numberOfOpenedFonts();
 -  if (num)
 -  {
 -    if (currentFontIndex_ >= num)
 -      currentFontIndex_ = num - 1;
 -  }
 -  else
 -    currentFontIndex_ = 0;
+-
 -  showFont();
 -}
+-
+-
 -void
 -MainGUI::watchCurrentFont()
 -{
 -  showFont();
 -}
+-
+-
 -void
 -MainGUI::showFont()
 -{
 -  // we do lazy computation of FT_Face objects
+-
 -  if (currentFontIndex_ < engine_->numberOfOpenedFonts())
 -  {
 -    QFileInfo& fileInfo = engine_->fontFileManager()[currentFontIndex_];
 -    QString fontName = fileInfo.fileName();
+-
 -    engine_->fontFileManager().updateWatching(currentFontIndex_);
 -    if (fileInfo.isSymLink())
 -    {
 -      fontName.prepend("<i>");
 -      fontName.append("</i>");
 -    }
+-
 -    if (!fileInfo.exists())
 -    {
 -      // On Unix-like systems, the symlink's target gets opened; this
 -      // implies that deletion of a symlink doesn't make `engine->loadFont'
 -      // fail since it operates on a file handle pointing to the target.
 -      // For this reason, we remove the font to enforce a reload.
 -      // However, we're just removing it from the Engine cache,
 -      // not deleting the entry in the font file manager
 -      engine_->removeFont(currentFontIndex_, false);
 -    }
+-
 -    fontFilenameLabel_->setText(fontName);
 -  }
 -  else
 -    fontFilenameLabel_->clear();
+-
 -  applySettings();
 -  currentNumberOfFaces_
 -    = engine_->numberOfFaces(currentFontIndex_);
 -  currentNumberOfNamedInstances_
 -    = engine_->numberOfNamedInstances(currentFontIndex_,
 -                                     currentFaceIndex_);
 -  currentNumberOfGlyphs_
 -    = engine_->loadFont(currentFontIndex_,
 -                       currentFaceIndex_,
 -                       currentNamedInstanceIndex_);
+-
 -  if (currentNumberOfGlyphs_ < 0)
 -  {
 -    // there might be various reasons why the current
 -    // (file, face, instance) triplet is invalid or missing;
 -    // we thus start our timer to periodically test
 -    // whether the font starts working
 -    if (currentFontIndex_ > 0
 -        && currentFontIndex_ < engine_->numberOfOpenedFonts())
 -      engine_->fontFileManager().timerStart();
 -  }
+-
 -  fontNameLabel_->setText(QString("%1 %2")
 -                         .arg(engine_->currentFamilyName())
 -                         .arg(engine_->currentStyleName()));
+-
 -  checkCurrentFontIndex();
 -  checkCurrentFaceIndex();
 -  checkCurrentNamedInstanceIndex();
 -  checkHinting();
 -  adjustGlyphIndex(0);
+-
 -  drawGlyph();
 -}
+-
+-
 -void
 -MainGUI::applySettings()
 -{
 -  // Spinbox value cannot become negative
 -  engine_->setDPI(static_cast<unsigned int>(dpiSpinBox_->value()));
+-
 -  if (unitsComboBox_->currentIndex() == Units_px)
 -    engine_->setSizeByPixel(sizeDoubleSpinBox_->value());
 -  else
 -    engine_->setSizeByPoint(sizeDoubleSpinBox_->value());
+-
 -  engine_->setHinting(hintingCheckBox_->isChecked());
 -  engine_->setAutoHinting(autoHintingCheckBox_->isChecked());
 -  engine_->setHorizontalHinting(horizontalHintingCheckBox_->isChecked());
 -  engine_->setVerticalHinting(verticalHintingCheckBox_->isChecked());
 -  engine_->setBlueZoneHinting(blueZoneHintingCheckBox_->isChecked());
 -  engine_->setShowSegments(segmentDrawingCheckBox_->isChecked());
+-
 -  engine_->setGamma(gammaSlider_->value());
+-
 -  engine_->setAntiAliasingTarget(
 -    antiAliasingComboBoxModel_
 -      ->indexToValue(antiAliasingComboBox_->currentIndex())
 -      .loadFlag);
 -}
+-
+-
 -void
 -MainGUI::clearStatusBar()
 -{
 -  statusBar()->clearMessage();
 -  statusBar()->setStyleSheet("");
 -}
+-
+-
 -void
 -MainGUI::checkHinting()
 -{
 -  if (hintingCheckBox_->isChecked())
 -  {
 -    if (engine_->currentFontType() == Engine::FontType_CFF)
 -    {
 -      hintingModeComboBoxModel_->setCurrentEngineType(
 -        HintingModeComboBoxModel::HintingEngineType_CFF, false); // XXX tricky
 -      hintingModeComboBox_->setCurrentIndex(currentCFFHintingMode_);
 -    }
 -    else if (engine_->currentFontType() == Engine::FontType_TrueType)
 -    {
 -      hintingModeComboBoxModel_->setCurrentEngineType( // XXX tricky
 -        HintingModeComboBoxModel::HintingEngineType_TrueType, false);
 -      hintingModeComboBox_->setCurrentIndex(currentTTInterpreterVersion_);
 -    }
 -    else
 -    {
 -      hintingModeLabel_->setEnabled(false);
 -      hintingModeComboBox_->setEnabled(false);
 -    }
+-
 -    autoHintingCheckBox_->setEnabled(true);
 -    checkAutoHinting();
 -  }
 -  else
 -  {
 -    hintingModeLabel_->setEnabled(false);
 -    hintingModeComboBox_->setEnabled(false);
+-
 -    autoHintingCheckBox_->setEnabled(false);
 -    horizontalHintingCheckBox_->setEnabled(false);
 -    verticalHintingCheckBox_->setEnabled(false);
 -    blueZoneHintingCheckBox_->setEnabled(false);
 -    segmentDrawingCheckBox_->setEnabled(false);
+-
 -    antiAliasingComboBoxModel_->setLightAntiAliasingEnabled(false);
 -    if (antiAliasingComboBox_->currentIndex()
 -      == AntiAliasingComboBoxModel::AntiAliasing_Light)
 -      antiAliasingComboBox_->setCurrentIndex(
 -        AntiAliasingComboBoxModel::AntiAliasing_Normal);
 -  }
+-
 -  drawGlyph();
 -}
+-
+-
 -void
 -MainGUI::checkHintingMode()
 -{
 -  int index = hintingModeComboBox_->currentIndex();
+-
 -  if (engine_->currentFontType() == Engine::FontType_CFF)
 -  {
 -    engine_->setCFFHintingMode(
 -      hintingModeComboBoxModel_->indexToCFFMode(index));
 -    currentCFFHintingMode_ = index;
 -  }
 -  else if (engine_->currentFontType() == Engine::FontType_TrueType)
 -  {
 -    engine_->setTTInterpreterVersion(
 -      hintingModeComboBoxModel_->indexToTTInterpreterVersion(index));
 -    currentTTInterpreterVersion_ = index;
 -  }
+-
 -  // this enforces reloading of the font
 -  showFont();
 -}
+-
+-
 -void
 -MainGUI::checkAutoHinting()
 -{
 -  if (autoHintingCheckBox_->isChecked())
 -  {
 -    hintingModeLabel_->setEnabled(false);
 -    hintingModeComboBox_->setEnabled(false);
+-
 -    horizontalHintingCheckBox_->setEnabled(true);
 -    verticalHintingCheckBox_->setEnabled(true);
 -    blueZoneHintingCheckBox_->setEnabled(true);
 -    segmentDrawingCheckBox_->setEnabled(true);
+-
 -    antiAliasingComboBoxModel_->setLightAntiAliasingEnabled(true);
 -  }
 -  else
 -  {
 -    if (engine_->currentFontType() == Engine::FontType_CFF
 -        || engine_->currentFontType() == Engine::FontType_TrueType)
 -    {
 -      hintingModeLabel_->setEnabled(true);
 -      hintingModeComboBox_->setEnabled(true);
 -    }
+-
 -    horizontalHintingCheckBox_->setEnabled(false);
 -    verticalHintingCheckBox_->setEnabled(false);
 -    blueZoneHintingCheckBox_->setEnabled(false);
 -    segmentDrawingCheckBox_->setEnabled(false);
+-
 -    antiAliasingComboBoxModel_->setLightAntiAliasingEnabled(false);
+-
 -    if (antiAliasingComboBox_->currentIndex()
 -        == AntiAliasingComboBoxModel::AntiAliasing_Light)
 -      antiAliasingComboBox_->setCurrentIndex(
 -          AntiAliasingComboBoxModel::AntiAliasing_Normal);
 -  }
+-
 -  drawGlyph();
 -}
+-
+-
 -void
 -MainGUI::checkAntiAliasing()
 -{
 -  int index = antiAliasingComboBox_->currentIndex();
+-
 -  if (index == AntiAliasingComboBoxModel::AntiAliasing_None
 -      || index == AntiAliasingComboBoxModel::AntiAliasing_Normal
 -      || index == AntiAliasingComboBoxModel::AntiAliasing_Light)
 -  {
 -    lcdFilterLabel_->setEnabled(false);
 -    lcdFilterComboBox_->setEnabled(false);
 -  }
 -  else
 -  {
 -    lcdFilterLabel_->setEnabled(true);
 -    lcdFilterComboBox_->setEnabled(true);
 -  }
+-
 -  drawGlyph();
 -}
+-
+-
 -void
 -MainGUI::checkLcdFilter()
 -{
 -  int index = lcdFilterComboBox_->currentIndex();
 -  engine_->setLcdFilter(static_cast<FT_LcdFilter>(
 -    lcdFilterComboboxModel_->indexToValue(index)));
 -}
+-
+-
 -void
 -MainGUI::checkShowPoints()
 -{
 -  if (showPointsCheckBox_->isChecked())
 -    showPointNumbersCheckBox_->setEnabled(true);
 -  else
 -    showPointNumbersCheckBox_->setEnabled(false);
+-
 -  drawGlyph();
 -}
+-
+-
 -void
 -MainGUI::checkUnits()
 -{
 -  int index = unitsComboBox_->currentIndex();
+-
 -  if (index == Units_px)
 -  {
 -    dpiLabel_->setEnabled(false);
 -    dpiSpinBox_->setEnabled(false);
 -    sizeDoubleSpinBox_->setSingleStep(1);
 -    sizeDoubleSpinBox_->setValue(qRound(sizeDoubleSpinBox_->value()));
 -  }
 -  else
 -  {
 -    dpiLabel_->setEnabled(true);
 -    dpiSpinBox_->setEnabled(true);
 -    sizeDoubleSpinBox_->setSingleStep(0.5);
 -  }
+-
 -  drawGlyph();
 -}
+-
+-
 -void
 -MainGUI::adjustGlyphIndex(int delta)
 -{
 -  // only adjust current glyph index if we have a valid font
 -  if (currentNumberOfGlyphs_ > 0)
 -  {
 -    currentGlyphIndex_ += delta;
 -    currentGlyphIndex_ = qBound(0,
 -                               currentGlyphIndex_,
 -                               currentNumberOfGlyphs_ - 1);
 -  }
+-
 -  QString upperHex = QString::number(currentGlyphIndex_, 16).toUpper();
 -  glyphIndexLabel_->setText(QString("%1 (0x%2)")
 -                                   .arg(currentGlyphIndex_)
 -                                   .arg(upperHex));
 -  glyphNameLabel_->setText(engine_->glyphName(currentGlyphIndex_));
+-
 -  drawGlyph();
 +  openFonts(files);
+ }
  void
 -MainGUI::checkCurrentFontIndex()
 +MainGUI::openFonts(QStringList const& fileNames)
+ {
 -  if (engine_->numberOfOpenedFonts() < 2)
 -  {
 -    previousFontButton_->setEnabled(false);
 -    nextFontButton_->setEnabled(false);
 -  }
 -  else if (currentFontIndex_ == 0)
 -  {
 -    previousFontButton_->setEnabled(false);
 -    nextFontButton_->setEnabled(true);
 -  }
 -  else if (currentFontIndex_ >= engine_->numberOfOpenedFonts() - 1)
 -  {
 -    previousFontButton_->setEnabled(true);
 -    nextFontButton_->setEnabled(false);
 -  }
 -  else
 -  {
 -    previousFontButton_->setEnabled(true);
 -    nextFontButton_->setEnabled(true);
 -  }
 +  engine_->openFonts(fileNames);
 +  tripletSelector_->repopulateFonts();
+ }
  void
 -MainGUI::checkCurrentFaceIndex()
 +MainGUI::onTripletChanged()
+ {
 -  if (currentNumberOfFaces_ < 2)
 -  {
 -    previousFaceButton_->setEnabled(false);
 -    nextFaceButton_->setEnabled(false);
 -  }
 -  else if (currentFaceIndex_ == 0)
 -  {
 -    previousFaceButton_->setEnabled(false);
 -    nextFaceButton_->setEnabled(true);
 -  }
 -  else if (currentFaceIndex_ >= currentNumberOfFaces_ - 1)
 -  {
 -    previousFaceButton_->setEnabled(true);
 -    nextFaceButton_->setEnabled(false);
 -  }
 -  else
 -  {
 -    previousFaceButton_->setEnabled(true);
 -    nextFaceButton_->setEnabled(true);
 -  }
 +  auto state = settingPanel_->blockSignals(true);
 +  settingPanel_->onFontChanged();
 +  settingPanel_->blockSignals(state);
 +  reloadCurrentTabFont();
+ }
  void
 -MainGUI::checkCurrentNamedInstanceIndex()
 +MainGUI::switchTab()
+ {
 -  if (currentNumberOfNamedInstances_ < 2)
 -  {
 -    previousNamedInstanceButton_->setEnabled(false);
 -    nextNamedInstanceButton_->setEnabled(false);
 -  }
 -  else if (currentNamedInstanceIndex_ == 0)
 -  {
 -    previousNamedInstanceButton_->setEnabled(false);
 -    nextNamedInstanceButton_->setEnabled(true);
 -  }
 -  else if (currentNamedInstanceIndex_ >= currentNumberOfNamedInstances_ - 1)
 -  {
 -    previousNamedInstanceButton_->setEnabled(true);
 -    nextNamedInstanceButton_->setEnabled(false);
 -  }
 -  else
 -  {
 -    previousNamedInstanceButton_->setEnabled(true);
 -    nextNamedInstanceButton_->setEnabled(true);
 -  }
 +  reloadCurrentTabFont();
 +  lastTab_ = tabWidget_->currentWidget();
+ }
  void
 -MainGUI::previousFont()
 +MainGUI::repaintCurrentTab()
+ {
 -  if (currentFontIndex_ > 0)
 -  {
 -    currentFontIndex_--;
 -    currentFaceIndex_ = 0;
 -    currentNamedInstanceIndex_ = 0;
 -    showFont();
 -  }
 -}
+-
+-
 -void
 -MainGUI::nextFont()
 -{
 -  if (currentFontIndex_ < engine_->numberOfOpenedFonts() - 1)
 -  {
 -    currentFontIndex_++;
 -    currentFaceIndex_ = 0;
 -    currentNamedInstanceIndex_ = 0;
 -    showFont();
 -  }
 -}
+-
+-
 -void
 -MainGUI::previousFace()
 -{
 -  if (currentFaceIndex_ > 0)
 -  {
 -    currentFaceIndex_--;
 -    currentNamedInstanceIndex_ = 0;
 -    showFont();
 -  }
 -}
+-
+-
 -void
 -MainGUI::nextFace()
 -{
 -  if (currentFaceIndex_ < currentNumberOfFaces_ - 1)
 -  {
 -    currentFaceIndex_++;
 -    currentNamedInstanceIndex_ = 0;
 -    showFont();
 -  }
 -}
+-
+-
 -void
 -MainGUI::previousNamedInstance()
 -{
 -  if (currentNamedInstanceIndex_ > 0)
 -  {
 -    currentNamedInstanceIndex_--;
 -    showFont();
 -  }
 -}
+-
+-
 -void
 -MainGUI::nextNamedInstance()
 -{
 -  if (currentNamedInstanceIndex_ < currentNumberOfNamedInstances_ - 1)
 -  {
 -    currentNamedInstanceIndex_++;
 -    showFont();
 -  }
 -}
+-
+-
 -void
 -MainGUI::zoom()
 -{
 -  int scale = static_cast<int>(zoomSpinBox_->value());
+-
 -  QTransform transform;
 -  transform.scale(scale, scale);
+-
 -  // we want horizontal and vertical 1px lines displayed with full pixels;
 -  // we thus have to shift the coordinate system accordingly, using a value
 -  // that represents 0.5px (i.e., half the 1px line width) after the scaling
 -  qreal shift = 0.5 / scale;
 -  transform.translate(shift, shift);
+-
 -  glyphView_->setTransform(transform);
 +  applySettings();
 +  tabs_[tabWidget_->currentIndex()]->repaintGlyph();
+ }
  void
 -MainGUI::setGraphicsDefaults()
 +MainGUI::reloadCurrentTabFont()
+ {
 -  // color tables (with suitable opacity values) for converting
 -  // FreeType's pixmaps to something Qt understands
 -  monoColorTable_.append(QColor(Qt::transparent).rgba());
 -  monoColorTable_.append(QColor(Qt::black).rgba());
+-
 -  for (int i = 0xFF; i >= 0; i--)
 -    grayColorTable_.append(qRgba(i, i, i, 0xFF - i));
+-
 -  // XXX make this user-configurable
+-
 -  axisPen_.setColor(Qt::black);
 -  axisPen_.setWidth(0);
 -  blueZonePen_.setColor(QColor(64, 64, 255, 64)); // light blue
 -  blueZonePen_.setWidth(0);
 -  gridPen_.setColor(Qt::lightGray);
 -  gridPen_.setWidth(0);
 -  offPen_.setColor(Qt::darkGreen);
 -  offPen_.setWidth(3);
 -  onPen_.setColor(Qt::red);
 -  onPen_.setWidth(3);
 -  outlinePen_.setColor(Qt::red);
 -  outlinePen_.setWidth(0);
 -  segmentPen_.setColor(QColor(64, 255, 128, 64)); // light green
 -  segmentPen_.setWidth(0);
 +  engine_->resetCache();
 +  applySettings();
 +  if (tabWidget_->currentIndex() > 0
 +      && static_cast<size_t>(tabWidget_->currentIndex()) < tabs_.size())
 +    tabs_[tabWidget_->currentIndex()]->reloadFont();
+ }
  void
 -MainGUI::drawGlyph()
 +MainGUI::applySettings()
+ {
 -  // the call to `engine->loadOutline' updates FreeType's load flags
+-
 -  if (!engine_)
 -    return;
+-
 -  if (currentGlyphBitmapItem_)
 -  {
 -    glyphScene_->removeItem(currentGlyphBitmapItem_);
 -    delete currentGlyphBitmapItem_;
+-
 -    currentGlyphBitmapItem_ = NULL;
 -  }
+-
 -  if (currentGlyphOutlineItem_)
 -  {
 -    glyphScene_->removeItem(currentGlyphOutlineItem_);
 -    delete currentGlyphOutlineItem_;
+-
 -    currentGlyphOutlineItem_ = NULL;
 -  }
+-
 -  if (currentGlyphPointsItem_)
 -  {
 -    glyphScene_->removeItem(currentGlyphPointsItem_);
 -    delete currentGlyphPointsItem_;
+-
 -    currentGlyphPointsItem_ = NULL;
 -  }
+-
 -  if (currentGlyphPointNumbersItem_)
 -  {
 -    glyphScene_->removeItem(currentGlyphPointNumbersItem_);
 -    delete currentGlyphPointNumbersItem_;
+-
 -    currentGlyphPointNumbersItem_ = NULL;
 -  }
+-
 -  applySettings();
 -  FT_Outline* outline = engine_->loadOutline(currentGlyphIndex_);
 -  if (outline)
 -  {
 -    if (showBitmapCheckBox_->isChecked())
 -    {
 -      // XXX support LCD
 -      FT_Pixel_Mode pixelMode = FT_PIXEL_MODE_GRAY;
 -      if (antiAliasingComboBox_->currentIndex()
 -          == AntiAliasingComboBoxModel::AntiAliasing_None)
 -        pixelMode = FT_PIXEL_MODE_MONO;
+-
 -      currentGlyphBitmapItem_ = new GlyphBitmap(outline,
 -                                               engine_->ftLibrary(),
 -                                               pixelMode,
 -                                               monoColorTable_,
 -                                               grayColorTable_);
 -      glyphScene_->addItem(currentGlyphBitmapItem_);
 -    }
+-
 -    if (showOutlinesCheckBox_->isChecked())
 -    {
 -      currentGlyphOutlineItem_ = new GlyphOutline(outlinePen_, outline);
 -      glyphScene_->addItem(currentGlyphOutlineItem_);
 -    }
+-
 -    if (showPointsCheckBox_->isChecked())
 -    {
 -      currentGlyphPointsItem_ = new GlyphPoints(onPen_, offPen_, outline);
 -      glyphScene_->addItem(currentGlyphPointsItem_);
+-
 -      if (showPointNumbersCheckBox_->isChecked())
 -      {
 -        currentGlyphPointNumbersItem_ = new GlyphPointNumbers(onPen_,
 -                                                             offPen_,
 -                                                             outline);
 -        glyphScene_->addItem(currentGlyphPointNumbersItem_);
 -      }
 -    }
 -  }
+-
 -  glyphScene_->update();
 +  settingPanel_->applySettings();
 +  settingPanel_->applyDelayedSettings();
+ }
@@ -723,299 +157,58 @@ void
  MainGUI::createLayout()
+ {
    // left side
 -  fontFilenameLabel_ = new QLabel;
+-
 -  hintingCheckBox_ = new QCheckBox(tr("Hinting"));
+-
 -  hintingModeLabel_ = new QLabel(tr("Hinting Mode"));
 -  hintingModeLabel_->setAlignment(Qt::AlignRight);
+-
 -  hintingModeComboBoxModel_ = new HintingModeComboBoxModel(this);
 -  hintingModeComboBox_ = new QComboBox;
 -  hintingModeComboBox_->setModel(hintingModeComboBoxModel_);
 -  hintingModeLabel_->setBuddy(hintingModeComboBox_);
+-
 -  autoHintingCheckBox_ = new QCheckBox(tr("Auto-Hinting"));
 -  horizontalHintingCheckBox_ = new QCheckBox(tr("Horizontal Hinting"));
 -  verticalHintingCheckBox_ = new QCheckBox(tr("Vertical Hinting"));
 -  blueZoneHintingCheckBox_ = new QCheckBox(tr("Blue-Zone Hinting"));
 -  segmentDrawingCheckBox_ = new QCheckBox(tr("Segment Drawing"));
+-
 -  antiAliasingLabel_ = new QLabel(tr("Anti-Aliasing"));
 -  antiAliasingLabel_->setAlignment(Qt::AlignRight);
+-
 -  antiAliasingComboBoxModel_ = new AntiAliasingComboBoxModel(this);
 -  antiAliasingComboBox_ = new QComboBox;
 -  antiAliasingComboBox_->setModel(antiAliasingComboBoxModel_);
 -  antiAliasingLabel_->setBuddy(antiAliasingComboBox_);
+-
 -  lcdFilterLabel_ = new QLabel(tr("LCD Filter"));
 -  lcdFilterLabel_->setAlignment(Qt::AlignRight);
+-
 -  lcdFilterComboboxModel_ = new LCDFilterComboBoxModel(this);
 -  lcdFilterComboBox_ = new QComboBox;
 -  lcdFilterComboBox_->setModel(lcdFilterComboboxModel_);
 -  lcdFilterLabel_->setBuddy(lcdFilterComboBox_);
+-
 -  int width;

From:	Charlie Jiang (@cqjjjzr)
Subject:	[Git][freetype/freetype-demos][gsoc-2022-chariri-final] 2 commits: [ftinspect] WIP: Rewrite `MainGUI`.
Date:	Sat, 03 Sep 2022 14:28:13 +0000