From 841b6886c7a2027e73538b4c72d8e287ff845914 Mon Sep 17 00:00:00 2001
From: Tao Zhong <taozhongimd@gmail.com>
Date: Wed, 6 Feb 2019 14:59:19 +0100
Subject: [PATCH] Add breaking icon
---
Resources/Icons/breaking.png | Bin 0 -> 939 bytes
Resources/resources.qrc | 1 +
forms/mainwindow.ui | 16 +++++++++++++++-
src/GraphicView.cpp | 3 ++-
src/GraphicView.h | 1 +
src/datamanager.cpp | 1 -
6 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 Resources/Icons/breaking.png
diff --git a/Resources/Icons/breaking.png b/Resources/Icons/breaking.png
new file mode 100644
index 0000000000000000000000000000000000000000..e10dc83b2b6617063f09d91fce5d13545a0f6097
GIT binary patch
literal 939
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$Sc;uILpV4%IBGajIv5xj
zI14-?iy0WWg+Z8+Vb&Z81_owdPZ!6KiaBqu`{zr$O0a!+Ui(IRMY_PVCV{oLR;QQG
zZ3?*B>>cR%DC6rSnH|jK8TO3x8xAS{Wa0SuenN;qb^4s@Q}cyO?HGLfKkkv)q&NG-
zjosT`H&oOIsbm|~-LG`J_C_b6$MBd$GL%T$Yc==WR1;tOogMdjyECG$y)0RGM53Ir
z=0euiCof)P<j?(^dMjeqviB>p{9Vi#wsd`*xayl{-t)?TceQ3sKeRtYYTx_4`?ot-
zdQN(>t>a5lkF-iW<ASB7?|q`b&*UvQ7pweJmBD;@q+e07frL#|!a|0IvfZ^iFJ`=X
zm{Y;fu&PeR>BpX|wJM(Lx=w`8*!)gnvHH%Jd+q1+6n;8rSw4Bm{O~0c=FXYZqI3G*
zx?LwWMLuNg@u-X4I<5HKvQ=SG<|j>#Nla4NX(%~)(TS}}f4D=X#pm@LfBfXZg9p=B
z#cLdT&s0%)YQMWuk@ES^_g7!>n)GDVs;Wu)VQ={v438~W5q|$yk<sJh=JnEY40;o5
z0!lw=9cC5?tqm}@VGz0hlgYyNLmu;wWqA{gLf^It)XgwGZuy<<r0p6tn@u{qm#(^h
zE#{S^;j!qmkG8}w<8ygZH*1-6@v_<u%ZJ^*uR>q0Ty^&rw{3gM`be8s)252nm(Jzi
z-~Mv;mzWi=N*}#{{%4mh_x-%>`s=N07P`)f6T9}-=Z7Tw<6?J)#irl?TyF`#dfYek
zZTE?6?`x+RYvNNEb>xI|*gJikF>7J>(Q|XtJ>HpnzFYC?ZYme!k1N&xldqoqoYxd8
z*LiLy<H^+fo@Hw02j`^h@@SQKeE#sm4{KL_{{N6QW6`x*1>ehd4SrYerLNi~?^H3F
z!J)|b*pHG%tNKZIR#{a}eaP7GB&_G-j#qy=B_3~FmB)DW^n~yK0$lE`-pT17^0n{#
zzwKI+!)4_d*qRS23s&wwr*=f5U%L0$+=m4}v;(T7c@*DF@?qe4CK`D4UxkgI6NmlP
zj6Zr|5_L)~8*b;A3D1!`V!ZN|T|?Qt=ltr)!S4^8+o^YQ-l{nE3qpdOhW{Kl@h9v)
z*BCx+*-Kl7`BU4ban;W&UZ<^8&RF8|B-Hlnj3;&tb2DGZy;DtKT<RN<`Q!f-6;HcU
no8Elwj%!Cs*vJ07|HG=hwtYdTuapD>0|SGntDnm{r-UW|j*-9H
literal 0
HcmV?d00001
diff --git a/Resources/resources.qrc b/Resources/resources.qrc
index e15a693..e2b4dc4 100644
--- a/Resources/resources.qrc
+++ b/Resources/resources.qrc
@@ -59,5 +59,6 @@
<file>Icons/landmark.svg</file>
<file>Icons/moved_hand.svg</file>
<file>Icons/attribute.svg</file>
+ <file>Icons/breaking.png</file>
</qresource>
</RCC>
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 2235dbf..b087b0f 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -24,7 +24,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>21</height>
+ <height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuDatei">
@@ -58,6 +58,7 @@
<addaction name="actionGather_data"/>
<addaction name="actionLandmarkWidget"/>
<addaction name="actionNew_Inifile"/>
+ <addaction name="actionBreak_Line"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
@@ -128,6 +129,7 @@
<addaction name="actiongridmode"/>
<addaction name="actionObjectsnap"/>
<addaction name="separator"/>
+ <addaction name="actionBreak_Line"/>
<addaction name="actionRoom"/>
</widget>
<action name="action_ffnen">
@@ -737,6 +739,18 @@
<string>Layers</string>
</property>
</action>
+ <action name="actionBreak_Line">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="../Resources/resources.qrc">
+ <normaloff>:/inAppIcons/Icons/breaking.png</normaloff>:/inAppIcons/Icons/breaking.png</iconset>
+ </property>
+ <property name="text">
+ <string>Break Line</string>
+ </property>
+ </action>
</widget>
<resources>
<include location="../Resources/resources.qrc"/>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index f327a6f..6281686 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -71,6 +71,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent, jpsDatamanager *datamanager):Q
statDoor=false;
statExit=false;
_statHLine=false;
+ stat_break_ = false;
statzoomwindows=false;
_statCopy=0;
statLandmark=false;
@@ -284,7 +285,7 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
drawLine();
}
}
- else if (statLandmark==true)
+ else if (statLandmark)
{
addLandmark();
}
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 8569eb9..3347444 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -217,6 +217,7 @@ private:
bool statExit;
bool statLandmark;
bool _statHLine;
+ bool stat_break_;
int _statCopy;
QPointF _copyOrigin;
qreal catch_radius;
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 57afeed..6006bc8 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -36,7 +36,6 @@
using myClock = std::chrono::high_resolution_clock;
-
jpsDatamanager::jpsDatamanager(QWidget *parent, jpsGraphicsView *view)
{
parent_widget=parent;
--
GitLab