Merge branch 'master' of github.com:nomacs/nomacs-plugins

nomacs · Mar 13, 2020 · 9fff6f7 · 9fff6f7
2 parents db4b594 + 9adaf77
commit 9fff6f7
Show file tree

Hide file tree

Showing 12 changed files with 438 additions and 5 deletions.
diff --git a/PaintPlugin/src/DkPaintPlugin.cpp b/PaintPlugin/src/DkPaintPlugin.cpp
diff --git a/PaintPlugin/src/DkPaintPlugin.h b/PaintPlugin/src/DkPaintPlugin.h
@@ -34,8 +34,10 @@
 #include <QString>
 #include <QMessageBox>
 #include <QAction>
+#include <QLineEdit>
 #include <QGraphicsPathItem>
 #include <QGraphicsSceneMouseEvent>
+#include <QGraphicsBlurEffect>
 #include <QToolBar>
 #include <QMainWindow>
 #include <QColorDialog>
@@ -55,6 +57,17 @@ namespace nmp {
 class DkPaintViewPort;
 class DkPaintToolBar;
 
+enum {
+	mode_pencil = 0,
+	mode_line,
+	mode_arrow,
+	mode_circle,
+	mode_square,
+	mode_square_fill,
+	mode_blur,
+	mode_text,
+};
+
 class DkPaintPlugin : public QObject, nmc::DkViewPortInterface {
     Q_OBJECT
     Q_INTERFACES(nmc::DkViewPortInterface)
@@ -68,6 +81,10 @@ class DkPaintPlugin : public QObject, nmc::DkViewPortInterface {
     QImage image() const override;
 	bool hideHUD() const override;
 
+	QPainterPath getArrowHead(QPainterPath line, const int thickness);
+	QLineF getShorterLine(QPainterPath line, const int thickness);
+	void getBlur(QPainterPath rect, QPainter *painter, QPixmap &pixmap, int radius);
+
 	QSharedPointer<nmc::DkImageContainer> runPlugin(const QString &runID = QString(), QSharedPointer<nmc::DkImageContainer> image = QSharedPointer<nmc::DkImageContainer>()) const override;
 	nmc::DkPluginViewPort* getViewPort() override;
 	bool createViewPort(QWidget* parent) override;
@@ -104,6 +121,14 @@ public slots:
 	virtual void setVisible(bool visible);
 	void undoLastPaint();
 
+signals:
+	void editShowSignal(bool show);
+
+protected slots:
+	void setMode(int mode);
+	void textChange(const QString &text);
+	void textEditFinsh();
+
 protected:
 	void mouseMoveEvent(QMouseEvent *event);
 	void mousePressEvent(QMouseEvent *event);
@@ -116,6 +141,13 @@ public slots:
 
 	QVector<QPainterPath> paths;
 	QVector<QPen> pathsPen;
+	QVector<int> pathsMode;
+	QPointF begin;
+	QString sbuffer;
+
+	int selectedMode;
+	bool textinputenable;
+	QPainterPath ArrowHead;
 
 	bool cancelTriggered;
 	bool isOutside;
@@ -140,9 +172,19 @@ class DkPaintToolBar : public QToolBar {
 		pan_icon,
 		undo_icon,
 
+		pencil_icon,
+		line_icon,
+		arrow_icon,
+		circle_icon,
+		square_icon,
+		square_fill_icon,
+		blur_icon,
+		text_icon,
+
 		icons_end,
 	};
 
+
 	DkPaintToolBar(const QString & title, QWidget * parent = 0);
 	virtual ~DkPaintToolBar();
 
@@ -154,10 +196,21 @@ public slots:
 	void on_applyAction_triggered();
 	void on_cancelAction_triggered();
 	void on_panAction_toggled(bool checked);
+	void on_pencilAction_toggled(bool checked);
+	void on_lineAction_toggled(bool checked);
+	void on_arrowAction_toggled(bool checked);
+	void on_circleAction_toggled(bool checked);
+	void on_squareAction_toggled(bool checked);
+	void on_squarefillAction_toggled(bool checked);
+	void on_blurAction_toggled(bool checked);
+	void on_textAction_toggled(bool checked);
 	void on_penColButton_clicked();
 	void on_widthBox_valueChanged(int val);
 	void on_alphaBox_valueChanged(int val);
+	void on_textInput_textChanged(const QString &text);
+	void on_textInput_editingFinished();
 	void on_undoAction_triggered();
+	void showLineEdit(bool show);
 	virtual void setVisible(bool visible);
 
 signals:
@@ -169,6 +222,9 @@ public slots:
 	void shadingHint(bool invert);
 	void panSignal(bool checked);
 	void undoSignal();
+	void modeChangeSignal(int mode);
+	void textChangeSignal(const QString &text);
+	void editFinishSignal();
 
 protected:
 	void createLayout();
@@ -180,9 +236,21 @@ public slots:
 	QSpinBox* alphaBox;
 	QColor penCol;
 	int penAlpha;
+	QMap<QString, QAction*> toolbarWidgetList;
 	QAction* panAction;
 	QAction* undoAction;
 
+	QAction* pencilAction;
+	QAction* lineAction;
+	QAction* arrowAction;
+	QAction* circleAction;
+	QAction* squareAction;
+	QAction* squarefillAction;
+	QAction* blurAction;
+	QAction* textAction;
+
+	QLineEdit* textInput;
+
 	QVector<QIcon> icons;		// needed for colorizing
 
 };

diff --git a/PaintPlugin/src/DkPaintPlugin.json b/PaintPlugin/src/DkPaintPlugin.json
@@ -3,7 +3,7 @@
 	"AuthorName" 	: "Tim Jerman",
 	"Company"		: "",
 	"DateCreated" 	: "2014-05-01",
-	"DateModified"	: "2018-11-30",
+	"DateModified"	: "2020-01-29",
 	"Description"	: "Paint on an image. The color, size and opacity of the brush can be changed.",
 	"Tagline" 		: "Draw with adjustable brushes to an image.",
 	"PluginId"		: "ad970ef36cc24737afd2b53ad015ff0d",

diff --git a/PaintPlugin/src/img/arrow.svg b/PaintPlugin/src/img/arrow.svg
diff --git a/PaintPlugin/src/img/blur.svg b/PaintPlugin/src/img/blur.svg
diff --git a/PaintPlugin/src/img/circle-outline.svg b/PaintPlugin/src/img/circle-outline.svg
diff --git a/PaintPlugin/src/img/line.svg b/PaintPlugin/src/img/line.svg
diff --git a/PaintPlugin/src/img/pencil.svg b/PaintPlugin/src/img/pencil.svg
diff --git a/PaintPlugin/src/img/square-outline.svg b/PaintPlugin/src/img/square-outline.svg
diff --git a/PaintPlugin/src/img/square.svg b/PaintPlugin/src/img/square.svg
diff --git a/PaintPlugin/src/img/text.svg b/PaintPlugin/src/img/text.svg
diff --git a/PaintPlugin/src/nomacsPlugin.qrc b/PaintPlugin/src/nomacsPlugin.qrc
@@ -1,5 +1,13 @@
 <RCC>
     <qresource prefix="/nomacsPluginPaint">
 	        <file>img/description.png</file>
+            <file>img/pencil.svg</file>
+            <file>img/line.svg</file>
+            <file>img/arrow.svg</file>
+            <file>img/circle-outline.svg</file>
+            <file>img/square-outline.svg</file>
+            <file>img/square.svg</file>
+            <file>img/blur.svg</file>
+            <file>img/text.svg</file>
     </qresource>
 </RCC>