fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-04-04 05:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Colors adjustment

Browse Source
This commit is contained in:
Jakub Melka 2020-12-23 18:33:09 +01:00
parent 5c7c0a5898
commit ac5a43c6ac
2 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Pdf4QtLib/sources/pdfobjecteditorwidget.cpp
View File

@ -427,14 +427,12 @@ void PDFObjectEditorWidgetMapper::createMappedAdapter(QGroupBox* groupBox, QGrid
int row = layout->rowCount(); int row = layout->rowCount();
QLabel* label = new QLabel(groupBox); QLabel* label = new QLabel(groupBox);
QPushButton* pushButton = new QPushButton(groupBox); QComboBox* comboBox = new QComboBox(groupBox);
pushButton->setText(tr("Color"));
pushButton->setFlat(true);
layout->addWidget(label, row, 0); layout->addWidget(label, row, 0);
layout->addWidget(pushButton, row, 1); layout->addWidget(comboBox, row, 1);
setAdapter(new PDFObjectEditorMappedColorAdapter(label, pushButton, m_model, attribute, this)); setAdapter(new PDFObjectEditorMappedColorAdapter(label, comboBox, m_model, attribute, this));
break; break;
} }
@ -863,28 +861,43 @@ void PDFObjectEditorMappedDoubleAdapter::update()
} }
PDFObjectEditorMappedColorAdapter::PDFObjectEditorMappedColorAdapter(QLabel* label, PDFObjectEditorMappedColorAdapter::PDFObjectEditorMappedColorAdapter(QLabel* label,
QPushButton* pushButton, QComboBox* comboBox,
PDFObjectEditorAbstractModel* model, PDFObjectEditorAbstractModel* model,
size_t attribute, size_t attribute,
QObject* parent) : QObject* parent) :
BaseClass(model, attribute, parent), BaseClass(model, attribute, parent),
m_label(label), m_label(label),
m_pushButton(pushButton), m_comboBox(comboBox)
m_color(Qt::black)
{ {
initLabel(label); initLabel(label);
comboBox->clear();
for (QString colorName : QColor::colorNames())
{
QColor color(colorName);
comboBox->addItem(getIconForColor(color), colorName, color);
}
connect(comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this, attribute](){ emit commitRequested(attribute); });
} }
PDFObject PDFObjectEditorMappedColorAdapter::getValue() const PDFObject PDFObjectEditorMappedColorAdapter::getValue() const
{ {
QColor color = m_comboBox->currentData().value<QColor>();
if (!color.isValid())
{
color = Qt::black;
}
PDFObjectFactory factory; PDFObjectFactory factory;
factory << m_color; factory << color;
return factory.takeObject(); return factory.takeObject();
} }
void PDFObjectEditorMappedColorAdapter::setValue(PDFObject object) void PDFObjectEditorMappedColorAdapter::setValue(PDFObject object)
{ {
m_color = Qt::black; QColor color = Qt::black;
PDFDocumentDataLoaderDecorator loader(m_model->getStorage()); PDFDocumentDataLoaderDecorator loader(m_model->getStorage());
std::vector<PDFReal> colors = loader.readNumberArray(object, { }); std::vector<PDFReal> colors = loader.readNumberArray(object, { });
@ -894,7 +907,18 @@ void PDFObjectEditorMappedColorAdapter::setValue(PDFObject object)
const PDFReal red = qBound(0.0, colors[0], 1.0); const PDFReal red = qBound(0.0, colors[0], 1.0);
const PDFReal green = qBound(0.0, colors[1], 1.0); const PDFReal green = qBound(0.0, colors[1], 1.0);
const PDFReal blue = qBound(0.0, colors[2], 1.0); const PDFReal blue = qBound(0.0, colors[2], 1.0);
m_color = QColor::fromRgbF(red, green, blue); color = QColor::fromRgbF(red, green, blue);
}
int index = m_comboBox->findData(color);
if (index != -1)
{
m_comboBox->setCurrentIndex(index);
}
else
{
m_comboBox->addItem(getIconForColor(color), tr("custom"), color);
m_comboBox->setCurrentIndex(m_comboBox->count() - 1);
} }
} }
@ -903,7 +927,20 @@ void PDFObjectEditorMappedColorAdapter::update()
const bool enabled = m_model->queryAttribute(m_attribute, PDFObjectEditorAbstractModel::Question::HasAttribute); const bool enabled = m_model->queryAttribute(m_attribute, PDFObjectEditorAbstractModel::Question::HasAttribute);
const bool readonly = !m_model->queryAttribute(m_attribute, PDFObjectEditorAbstractModel::Question::IsAttributeEditable); const bool readonly = !m_model->queryAttribute(m_attribute, PDFObjectEditorAbstractModel::Question::IsAttributeEditable);
m_pushButton->setEnabled(enabled && !readonly); m_comboBox->setEnabled(enabled && !readonly);
}
QIcon PDFObjectEditorMappedColorAdapter::getIconForColor(QColor color) const
{
QIcon icon;
QSize iconSize = PDFWidgetUtils::scaleDPI(m_comboBox, QSize(16, 16));
QPixmap pixmap(iconSize.width(), iconSize.height());
pixmap.fill(color);
icon.addPixmap(pixmap);
return icon;
} }
PDFEditObjectDialog::PDFEditObjectDialog(EditObjectType type, QWidget* parent) : PDFEditObjectDialog::PDFEditObjectDialog(EditObjectType type, QWidget* parent) :

7
Pdf4QtLib/sources/pdfobjecteditorwidget_impl.h
View File

@ -259,16 +259,17 @@ private:
using BaseClass = PDFObjectEditorMappedWidgetAdapter; using BaseClass = PDFObjectEditorMappedWidgetAdapter;
public: public:
explicit PDFObjectEditorMappedColorAdapter(QLabel* label, QPushButton* pushButton, PDFObjectEditorAbstractModel* model, size_t attribute, QObject* parent); explicit PDFObjectEditorMappedColorAdapter(QLabel* label, QComboBox* comboBox, PDFObjectEditorAbstractModel* model, size_t attribute, QObject* parent);
virtual PDFObject getValue() const override; virtual PDFObject getValue() const override;
virtual void setValue(PDFObject object) override; virtual void setValue(PDFObject object) override;
virtual void update() override; virtual void update() override;
private: private:
QIcon getIconForColor(QColor color) const;
QLabel* m_label; QLabel* m_label;
QPushButton* m_pushButton; QComboBox* m_comboBox;
QColor m_color;
}; };
class PDFObjectEditorMappedDoubleAdapter : public PDFObjectEditorMappedWidgetAdapter class PDFObjectEditorMappedDoubleAdapter : public PDFObjectEditorMappedWidgetAdapter