fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-03-13 18:00:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Editor plugin: Bugfixing

Browse Source
This commit is contained in:
Jakub Melka 2024-06-06 21:00:57 +02:00
parent 9222a60039
commit 3a74e0c565
4 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Pdf4QtEditorPlugins/EditorPlugin/editorplugin.cpp
View File

@ -25,6 +25,7 @@
#include "pdfdocumentwriter.h"
#include "pdfpagecontenteditorprocessor.h"
#include "pdfstreamfilters.h"
#include "pdfoptimizer.h"
#include <QAction>
#include <QToolButton>
@ -41,7 +42,8 @@ EditorPlugin::EditorPlugin() :
m_tools({ }),
m_editorWidget(nullptr),
m_scene(nullptr),
m_sceneSelectionChangeEnabled(true)
m_sceneSelectionChangeEnabled(true),
m_isSaving(false)
{
m_scene.setIsPageContentDrawSuppressed(true);
}
@ -184,6 +186,8 @@ QString EditorPlugin::getPluginMenuName() const
bool EditorPlugin::save()
{
pdf::PDFTemporaryValueChange guard(&m_isSaving, true);
if (QMessageBox::question(m_dataExchangeInterface->getMainWindow(), tr("Confirm Changes"), tr("The changes to the page content will be written to the document. Do you want to continue?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
{
pdf::PDFDocumentModifier modifier(m_document);
@ -290,7 +294,7 @@ bool EditorPlugin::save()
factory.endDictionary();
factory.endDictionaryItem();
factory.beginDictionaryItem("Content");
factory.beginDictionaryItem("Contents");
factory << builder->addObject(std::move(contentObject));
factory.endDictionaryItem();
@ -307,7 +311,17 @@ bool EditorPlugin::save()
if (modifier.finalize())
{
Q_EMIT m_widget->getToolManager()->documentModified(pdf::PDFModifiedDocument(modifier.getDocument(), nullptr, modifier.getFlags()));
pdf::PDFDocument document = *modifier.getDocument();
pdf::PDFOptimizer optimizer(pdf::PDFOptimizer::DereferenceSimpleObjects |
pdf::PDFOptimizer::RemoveNullObjects |
pdf::PDFOptimizer::RemoveUnusedObjects |
pdf::PDFOptimizer::MergeIdenticalObjects |
pdf::PDFOptimizer::ShrinkObjectStorage, nullptr);
optimizer.setDocument(&document);
optimizer.optimize();
document = optimizer.takeOptimizedDocument();
Q_EMIT m_widget->getToolManager()->documentModified(pdf::PDFModifiedDocument(pdf::PDFDocumentPointer(new pdf::PDFDocument(std::move(document))), nullptr, modifier.getFlags()));
}
}
@ -578,9 +592,9 @@ void EditorPlugin::updateDockWidget()
void EditorPlugin::updateEditedPages()
{
if (!m_scene.isActive())
if (!m_scene.isActive() || m_isSaving)
{
// Editor is not active
// Editor is not active or we are saving the document
return;
}

1
Pdf4QtEditorPlugins/EditorPlugin/editorplugin.h
View File

@ -121,6 +121,7 @@ private:
pdf::PDFPageContentScene m_scene;
std::map<pdf::PDFInteger, pdf::PDFEditedPageContent> m_editedPageContent;
bool m_sceneSelectionChangeEnabled;
bool m_isSaving;
};
} // namespace pdfplugin

64
Pdf4QtLibCore/sources/pdfpagecontenteditorprocessor.cpp
View File

@ -68,15 +68,18 @@ void PDFPageContentEditorProcessor::performInterceptInstruction(Operator current
{
if (currentOperator == Operator::TextEnd && !isTextProcessing())
{
if (m_contentElementText && !m_contentElementText->isEmpty())
if (m_contentElementText)
{
m_contentElementText->setTextPath(std::move(m_textPath));
m_contentElementText->setItemsAsText(PDFEditedPageContentElementText::createItemsAsText(m_contentElementText->getState(), m_contentElementText->getItems()));
m_content.addContentElement(std::move(m_contentElementText));
m_contentElementText->optimize();
if (!m_contentElementText->isEmpty())
{
m_contentElementText->setTextPath(std::move(m_textPath));
m_contentElementText->setItemsAsText(PDFEditedPageContentElementText::createItemsAsText(m_contentElementText->getState(), m_contentElementText->getItems()));
m_content.addContentElement(std::move(m_contentElementText));
}
}
m_contentElementText.reset();
m_textBoundingRect = QRectF();
m_textPath = QPainterPath();
}
}
@ -93,10 +96,7 @@ void PDFPageContentEditorProcessor::performPathPainting(const QPainterPath& path
if (text)
{
QPainterPath mappedPath = getGraphicState()->getCurrentTransformationMatrix().map(path);
QRectF boundingRect = mappedPath.boundingRect();
m_textBoundingRect = m_textBoundingRect.united(boundingRect);
m_textPath.addPath(mappedPath);
m_textPath.addPath(path);
}
else
{
@ -778,6 +778,14 @@ void PDFEditedPageContentElementText::setItemsAsText(const QString& newItemsAsTe
m_itemsAsText = newItemsAsText;
}
void PDFEditedPageContentElementText::optimize()
{
while (!m_items.empty() && !m_items.back().isText)
{
m_items.pop_back();
}
}
PDFPageContentEditorContentStreamBuilder::PDFPageContentEditorContentStreamBuilder(PDFDocument* document) :
m_document(document)
{
@ -786,12 +794,28 @@ PDFPageContentEditorContentStreamBuilder::PDFPageContentEditorContentStreamBuild
void PDFPageContentEditorContentStreamBuilder::writeStateDifference(QTextStream& stream, const PDFPageContentProcessorState& state)
{
PDFPageContentProcessorState oldState = m_currentState;
m_currentState.setState(state);
auto stateFlags = m_currentState.getStateFlags();
if (stateFlags.testFlag(PDFPageContentProcessorState::StateCurrentTransformationMatrix))
{
QTransform oldTransform = oldState.getCurrentTransformationMatrix();
if (!oldTransform.isIdentity() && oldTransform.isInvertible())
{
oldTransform = oldTransform.inverted();
PDFReal old_m11 = oldTransform.m11();
PDFReal old_m12 = oldTransform.m12();
PDFReal old_m21 = oldTransform.m21();
PDFReal old_m22 = oldTransform.m22();
PDFReal old_x = oldTransform.dx();
PDFReal old_y = oldTransform.dy();
stream << old_m11 << " " << old_m12 << " " << old_m21 << " " << old_m22 << " " << old_x << " " << old_y << " cm" << Qt::endl;
}
QTransform transform = m_currentState.getCurrentTransformationMatrix();
PDFReal m11 = transform.m11();
@ -841,7 +865,7 @@ void PDFPageContentEditorContentStreamBuilder::writeStateDifference(QTextStream&
stream << arrayItem << " ";
}
stream << " ] " << dashPattern.getDashOffset() << " d";
stream << " ] " << dashPattern.getDashOffset() << " d" << Qt::endl;
}
}
@ -888,15 +912,15 @@ void PDFPageContentEditorContentStreamBuilder::writeStateDifference(QTextStream&
}
else if (strokeColorSpace && strokeColorSpace->getColorSpace() == PDFAbstractColorSpace::ColorSpace::DeviceCMYK)
{
const PDFColor& color = m_currentState.getStrokeColorOriginal();
if (color.size() >= 4)
const PDFColor& strokeColorOriginal = m_currentState.getStrokeColorOriginal();
if (strokeColorOriginal.size() >= 4)
{
stream << color[0] << " " << color[1] << " " << color[2] << " " << color[3] << " K";
stream << strokeColorOriginal[0] << " " << strokeColorOriginal[1] << " " << strokeColorOriginal[2] << " " << strokeColorOriginal[3] << " K" << Qt::endl;
}
}
else
{
stream << color.redF() << " " << color.greenF() << " " << color.blueF() << " RG";
stream << color.redF() << " " << color.greenF() << " " << color.blueF() << " RG" << Qt::endl;
}
}
@ -911,15 +935,15 @@ void PDFPageContentEditorContentStreamBuilder::writeStateDifference(QTextStream&
}
else if (fillColorSpace && fillColorSpace->getColorSpace() == PDFAbstractColorSpace::ColorSpace::DeviceCMYK)
{
const PDFColor& color = m_currentState.getFillColorOriginal();
if (color.size() >= 4)
const PDFColor& fillColor = m_currentState.getFillColorOriginal();
if (fillColor.size() >= 4)
{
stream << color[0] << " " << color[1] << " " << color[2] << " " << color[3] << " K";
stream << fillColor[0] << " " << fillColor[1] << " " << fillColor[2] << " " << fillColor[3] << " K" << Qt::endl;
}
}
else
{
stream << color.redF() << " " << color.greenF() << " " << color.blueF() << " RG";
stream << color.redF() << " " << color.greenF() << " " << color.blueF() << " RG" << Qt::endl;
}
}
@ -1040,7 +1064,7 @@ void PDFPageContentEditorContentStreamBuilder::writeElement(const PDFEditedPageC
PDFPageContentProcessorState state = element->getState();
state.setCurrentTransformationMatrix(element->getTransform());
QTextStream stream(&m_outputContent, QDataStream::WriteOnly);
QTextStream stream(&m_outputContent, QDataStream::WriteOnly | QDataStream::Append);
writeStateDifference(stream, state);
if (const PDFEditedPageContentElementImage* imageElement = element->asImage())

3
Pdf4QtLibCore/sources/pdfpagecontenteditorprocessor.h
View File

@ -169,6 +169,8 @@ public:
QString getItemsAsText() const;
void setItemsAsText(const QString& newItemsAsText);
void optimize();
private:
std::vector<Item> m_items;
QPainterPath m_textPath;
@ -283,7 +285,6 @@ protected:
private:
PDFEditedPageContent m_content;
QRectF m_textBoundingRect;
std::stack<QPainterPath> m_clippingPaths;
std::unique_ptr<PDFEditedPageContentElementText> m_contentElementText;
QPainterPath m_textPath;