Dimensions plugin update

This commit is contained in:
Jakub Melka
2020-11-19 19:54:33 +01:00
parent 4c410374db
commit 3b2d3877f7
21 changed files with 834 additions and 25 deletions

View File

@@ -3206,7 +3206,7 @@ void PDFWidgetAnnotation::draw(AnnotationDrawParameters& parameters) const
{
switch (m_highlightMode)
{
case LinkHighlightMode::Invert:
case HighlightMode::Invert:
{
// Invert all
painter->setCompositionMode(QPainter::CompositionMode_Difference);
@@ -3214,7 +3214,7 @@ void PDFWidgetAnnotation::draw(AnnotationDrawParameters& parameters) const
break;
}
case LinkHighlightMode::Outline:
case HighlightMode::Outline:
{
// Invert the border
painter->setCompositionMode(QPainter::CompositionMode_Difference);
@@ -3226,7 +3226,7 @@ void PDFWidgetAnnotation::draw(AnnotationDrawParameters& parameters) const
break;
}
case LinkHighlightMode::Push:
case HighlightMode::Push:
{
// Draw border
painter->setCompositionMode(getCompositionMode());

View File

@@ -304,12 +304,12 @@ bool PDFDrawWidgetBase<BaseWidget>::processEvent(Event* event)
// If event is accepted, then update cursor/tooltip and return
if (event->isAccepted())
{
setToolTip(tooltip);
updateCursor();
this->setToolTip(tooltip);
this->updateCursor();
return true;
}
}
setToolTip(tooltip);
this->setToolTip(tooltip);
return false;
}

View File

@@ -41,7 +41,7 @@ template<typename T, size_t FlatSize>
class PDFFlatArray
{
public:
explicit PDFFlatArray() :
PDFFlatArray() :
m_flatBlock(),
m_flatBlockItemCount(0),
m_variableBlock()
@@ -50,7 +50,7 @@ public:
}
template<typename... Arguments, typename std::enable_if<sizeof...(Arguments) <= FlatSize, int>::type = 0>
explicit inline PDFFlatArray(Arguments... arguments) :
inline PDFFlatArray(Arguments... arguments) :
m_flatBlock({ arguments... }),
m_flatBlockItemCount(sizeof...(Arguments)),
m_variableBlock()

View File

@@ -619,7 +619,7 @@ public:
const PDFAction* getAction(PDFAnnotationAdditionalActions::Action actionType, const PDFFormWidget* widget);
/// Returns default form apperance flags
static constexpr FormAppearanceFlags getDefaultApperanceFlags() { return HighlightFields | HighlightRequiredFields; }
static constexpr FormAppearanceFlags getDefaultApperanceFlags() { return FormAppearanceFlags(HighlightFields | HighlightRequiredFields); }
struct MouseEventInfo
{

View File

@@ -21,19 +21,26 @@ namespace pdf
{
PDFPlugin::PDFPlugin(QObject* parent) :
QObject(parent)
QObject(parent),
m_widget(nullptr),
m_document(nullptr)
{
}
void PDFPlugin::setWidget(PDFWidget* widget)
{
Q_UNUSED(widget)
m_widget = widget;
}
void PDFPlugin::setDocument(const PDFModifiedDocument& document)
{
Q_UNUSED(document)
m_document = document;
}
std::vector<QAction*> PDFPlugin::getActions() const
{
return std::vector<QAction*>();
}
PDFPluginInfo PDFPluginInfo::loadFromJson(const QJsonObject* json)

View File

@@ -23,6 +23,10 @@
#include <QObject>
#include <QJsonObject>
#include <vector>
class QAction;
namespace pdf
{
class PDFWidget;
@@ -48,6 +52,11 @@ public:
virtual void setWidget(PDFWidget* widget);
virtual void setDocument(const PDFModifiedDocument& document);
virtual std::vector<QAction*> getActions() const;
protected:
PDFWidget* m_widget;
PDFDocument* m_document;
};
} // namespace pdf

View File

@@ -99,7 +99,7 @@ public:
static QMatrix createPagePointToDevicePointMatrix(const PDFPage* page, const QRectF& rectangle);
/// Returns default renderer features
static constexpr Features getDefaultFeatures() { return Antialiasing | TextAntialiasing | ClipToCropBox | DisplayAnnotations; }
static constexpr Features getDefaultFeatures() { return Features(Antialiasing | TextAntialiasing | ClipToCropBox | DisplayAnnotations); }
private:
const PDFDocument* m_document;

View File

@@ -650,7 +650,7 @@ private:
template<typename T>
QDataStream& operator>>(QDataStream& stream, std::vector<T>& vector)
{
std::vector<T>::size_type size = 0;
typename std::vector<T>::size_type size = 0;
stream >> size;
vector.resize(size);
for (T& item : vector)
@@ -674,7 +674,7 @@ QDataStream& operator<<(QDataStream& stream, const std::vector<T>& vector)
template<typename T, size_t Size>
QDataStream& operator>>(QDataStream& stream, std::array<T, Size>& array)
{
std::array<T, Size>::size_type size = 0;
typename std::array<T, Size>::size_type size = 0;
stream >> size;
for (size_t i = 0; i < size; ++i)
@@ -713,7 +713,7 @@ QDataStream& operator<<(QDataStream& stream, const std::array<T, Size>& array)
template<typename T>
QDataStream& operator>>(QDataStream& stream, std::set<T>& set)
{
std::set<T>::size_type size = 0;
typename std::set<T>::size_type size = 0;
stream >> size;
for (size_t i = 0; i < size; ++i)
{