From d718151280274fcbd24f593e736d6937ccd74f91 Mon Sep 17 00:00:00 2001 From: Evgeny Redikultsev Date: Sun, 13 Aug 2023 16:53:49 +0500 Subject: [PATCH] Icons for tools and analises were added --- .../UI/DataContexts/PrimitiveBase.cs | 1 + .../UI/Icons/32х32_Border/Calculator.png | Bin 0 -> 2409 bytes .../{Add_Circle.png => Circle.png} | Bin ...o center.png => MovePrimitivesToCenter.png} | Bin .../{Edit_Add point.png => Point.png} | Bin .../{Edit_Concrete beam.png => RC_Beam.png} | Bin ...{Edit_Concrete column.png => RC_Column.png} | Bin .../32х32_Border/{Add_Rebar.png => Rebar.png} | Bin .../UI/Icons/32х32_Border/Run.png | Bin 0 -> 2413 bytes StructureHelper/StructureHelper.csproj | 10 + .../Windows/MainWindow/Calculator.png | Bin 0 -> 2409 bytes StructureHelper/Windows/MainWindow/Circle.png | Bin 0 -> 3122 bytes .../Windows/MainWindow/MainView.xaml | 294 +++++++++++------- .../MainWindow/MovePrimitivesToCenter.png | Bin 0 -> 3509 bytes StructureHelper/Windows/MainWindow/Run.png | Bin 0 -> 2413 bytes .../Windows/MainWindow/Tools_Settings.png | Bin 0 -> 4998 bytes 16 files changed, 187 insertions(+), 118 deletions(-) create mode 100644 StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png rename StructureHelper/Infrastructure/UI/Icons/32х32_Border/{Add_Circle.png => Circle.png} (100%) rename StructureHelper/Infrastructure/UI/Icons/32х32_Border/{Move primitives to center.png => MovePrimitivesToCenter.png} (100%) rename StructureHelper/Infrastructure/UI/Icons/32х32_Border/{Edit_Add point.png => Point.png} (100%) rename StructureHelper/Infrastructure/UI/Icons/32х32_Border/{Edit_Concrete beam.png => RC_Beam.png} (100%) rename StructureHelper/Infrastructure/UI/Icons/32х32_Border/{Edit_Concrete column.png => RC_Column.png} (100%) rename StructureHelper/Infrastructure/UI/Icons/32х32_Border/{Add_Rebar.png => Rebar.png} (100%) create mode 100644 StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png create mode 100644 StructureHelper/Windows/MainWindow/Calculator.png create mode 100644 StructureHelper/Windows/MainWindow/Circle.png create mode 100644 StructureHelper/Windows/MainWindow/MovePrimitivesToCenter.png create mode 100644 StructureHelper/Windows/MainWindow/Run.png create mode 100644 StructureHelper/Windows/MainWindow/Tools_Settings.png diff --git a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs index b280374..39f4dbd 100644 --- a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs +++ b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs @@ -267,6 +267,7 @@ namespace StructureHelper.Infrastructure.UI.DataContexts OnPropertyChanged(nameof(Color)); OnPropertyChanged(nameof(CenterX)); OnPropertyChanged(nameof(CenterY)); + OnPropertyChanged(nameof(InvertedCenterY)); OnPropertyChanged(nameof(SetMaterialColor)); OnPropertyChanged(nameof(Triangulate)); OnPropertyChanged(nameof(PrimitiveWidth)); diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..33374c68c77c507d9dc54dd4c2c4ded3165810e9 GIT binary patch literal 2409 zcmbVN4Nw&48U9XwL?U>>5yUugT_Ez4y}jMLTkdu^1n!6sJ%i`9;!l*l-MwS$-R-fr zz(LV)XbUvZxkRIw6tPpaaq?456VoXjJ%57+42h}QrkyhR0Uhh4PEyg(O#3YyS7VIL z^k(+<+x?#Jd7tlj-|yYds+G%9k{2Wc08%O|taf-ulq)F_{s)?yzl67Vcd4xufFpaE z6{X|KBwJy(0nn}npeqf4ui-dU48Yp!K$SKJfTB?VGB5o897+P9dQ7lbs!BQ0$s_h< zWk@bzG8yv#$bFBksUiJxoy4cr)C>$2DD*xUxS+xFz|V9SRBx0& z|Hg^GryvchD#E((miU3uSeB;4SmmJ8CUz5Ij|7dzaa5QHuW8SA3IlJ~B1b;01%gn?! z^-uPxFM=PvIn3=N!I`-2|1_x=9_w$0pu4mD6>9?kq@GqT)e8lwj{uNx zM{rcj)wUHhD|$7IVy7nP^+PnYduh@6mzNnN==JylbkK}W^3rguyv9*v5+ZLlqf_~-wpAe( zQQ{GUhQe4vPa=gT4MAy5r2cV))Dnfbwh$+Dn3kZm6sC1O~Attg9u zTJbxmW7FRV0IjvzVlnQk#p{iQ2*~9Pa2ruW?u!mMn*2O&=L2HB#Pa10P-d308$WH4 zct#c_hbVfc6IC@W8L?QD#2As>HG+>58v}WFt>LYV%$reCODZYDNWwvowBAVT$pWo` z)@rAqHjxutP2Yy80h#f!e5KWlLVGlVz|j=pG!#-SiBSgDfa#5T z1~VENJ!YVIP6tmZM{WUT?z$(5k|;k=7G{)H>VfCb=xgCVetfUU(e;hBJS2TU zkxWGoh%UL2k@!+K^lmyk52{1_yYvT`h6k(ve%YLo^=<3qR(o|~jd$TqZTTfF1xqhEY}fqOn@?1kk=|M2FFwZn_P3^`u8>=DOHX7Bmz!1(N4 z{Hm>%q*gCprg?khPPXCH{2<@O_z#1YcXohZy{}$4_UuFF#W}xhX_(!6Ieq-s31>@k zhi(=;kv?Ov?9lNqib!AktlZv=jq@*F-L(5!cUn@UXqheN+P|__FMjLKDIehr%lap> ze_FPnoBZ&)t#16K-q+gx(Q>%DK79Rf()!-^s>r!(5BCipX!`MzqD3uEIeh(WyvLJz z+q%(@U$7I*N@?UwdMkt-SRW~!IgDxc@d@|D)t%WB&G1B59>tpET3 literal 0 HcmV?d00001 diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Circle.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png similarity index 100% rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Circle.png rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Move primitives to center.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png similarity index 100% rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Move primitives to center.png rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add point.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png similarity index 100% rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add point.png rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete beam.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png similarity index 100% rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete beam.png rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete column.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png similarity index 100% rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete column.png rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Rebar.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png similarity index 100% rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Rebar.png rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d50e421155fc51cb1394289d766cf39c6e742a GIT binary patch literal 2413 zcmbVN4Nw&48U9XwR1`TCr5L8OE<-#Zcl&cc>~1*)?$jgk5YMapXbpS2d&envd+si9 zFpc2|iZsR=OM@C?;*^@!Wc*2tj-eBYO5z_R)&$c|rr;DXliHt|Qms{EzlGy!j4_$s z%-(*x-}621^F8nTz1vn=vNSnqUJ?Kxx!7TM!8@W}Qxf67+}Jn@Z}GlDXCVMb_Oip1=!{r2^RSUq@SpeLHr<4?aj?jlImSswrq7(E&8bYgYJtUvF%(>!ZwX&AyT(? zhM>jeez2tI$%ivGRpB#QWXD_UlD;?9swsP;P= zC1GV_iJNO&&(S=(Xd#jxW*|X8P*@}!s0qqU*ouzvGH|TE#!zGoqO7-~Lt!+D_cAW~l4vaWWJRkL zCB$G@eSN*5-e?dd9|miK#&8lNNj*g9<%XcbhV?-?bArJx$eiR4DSk1CsEn*ftW~Ti zR64$eKqy8Vl%qC5!>}+L!UzMdZfOk2b1__~R;n2b&U2VhBLsw?B10?@!-lFwMU<<> zZ=sG&e=PvC*6EDJc&L^@AQnPa7T3XTL=AZ;T6Q;t1k5GKVy(mpi|e4wOm#OQ#wH1@ zB1&#iteHqu>4ap&W>XVGA-XbukQeLa?EBUTc2*IrD2bD5%Jd}RCP>CaF(xt>H#0as z4t0vW-`ns_sF5Lzj4|(PP*^oQtFYe*<~hbIN&yz`*&kqi0u~DTP$cFgV-ssc2?mDh zjQ77UhOI;rz5W_F@nB0CQ|ojx#X(tNgPc%ox1!JMhI){Wsqte*=(NG-u`J=lM&9ezvSEVdWA%a`_a3_N)n zPi_6hl0$cH&uXSpQ-AtuB(Lwnk>{|M zPZ|mKbb{A+?cR|Z+Q%CAt)4zVy8sT}NiQkr0+HLKbU6Oh-s)drRgnXmN3S^#fT?FT zelj3E`(ji4odw9ITh5BCh%0yS(BspWM^^1y1uBwr=457T4>qr?Jesy+(vgC`=cdfu zd@tqb3$B;nIDR$m*tGsg|8R5JB-c + + @@ -33,10 +35,13 @@ + + + @@ -75,9 +80,12 @@ + + + Always @@ -89,8 +97,10 @@ + + diff --git a/StructureHelper/Windows/MainWindow/Calculator.png b/StructureHelper/Windows/MainWindow/Calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..33374c68c77c507d9dc54dd4c2c4ded3165810e9 GIT binary patch literal 2409 zcmbVN4Nw&48U9XwL?U>>5yUugT_Ez4y}jMLTkdu^1n!6sJ%i`9;!l*l-MwS$-R-fr zz(LV)XbUvZxkRIw6tPpaaq?456VoXjJ%57+42h}QrkyhR0Uhh4PEyg(O#3YyS7VIL z^k(+<+x?#Jd7tlj-|yYds+G%9k{2Wc08%O|taf-ulq)F_{s)?yzl67Vcd4xufFpaE z6{X|KBwJy(0nn}npeqf4ui-dU48Yp!K$SKJfTB?VGB5o897+P9dQ7lbs!BQ0$s_h< zWk@bzG8yv#$bFBksUiJxoy4cr)C>$2DD*xUxS+xFz|V9SRBx0& z|Hg^GryvchD#E((miU3uSeB;4SmmJ8CUz5Ij|7dzaa5QHuW8SA3IlJ~B1b;01%gn?! z^-uPxFM=PvIn3=N!I`-2|1_x=9_w$0pu4mD6>9?kq@GqT)e8lwj{uNx zM{rcj)wUHhD|$7IVy7nP^+PnYduh@6mzNnN==JylbkK}W^3rguyv9*v5+ZLlqf_~-wpAe( zQQ{GUhQe4vPa=gT4MAy5r2cV))Dnfbwh$+Dn3kZm6sC1O~Attg9u zTJbxmW7FRV0IjvzVlnQk#p{iQ2*~9Pa2ruW?u!mMn*2O&=L2HB#Pa10P-d308$WH4 zct#c_hbVfc6IC@W8L?QD#2As>HG+>58v}WFt>LYV%$reCODZYDNWwvowBAVT$pWo` z)@rAqHjxutP2Yy80h#f!e5KWlLVGlVz|j=pG!#-SiBSgDfa#5T z1~VENJ!YVIP6tmZM{WUT?z$(5k|;k=7G{)H>VfCb=xgCVetfUU(e;hBJS2TU zkxWGoh%UL2k@!+K^lmyk52{1_yYvT`h6k(ve%YLo^=<3qR(o|~jd$TqZTTfF1xqhEY}fqOn@?1kk=|M2FFwZn_P3^`u8>=DOHX7Bmz!1(N4 z{Hm>%q*gCprg?khPPXCH{2<@O_z#1YcXohZy{}$4_UuFF#W}xhX_(!6Ieq-s31>@k zhi(=;kv?Ov?9lNqib!AktlZv=jq@*F-L(5!cUn@UXqheN+P|__FMjLKDIehr%lap> ze_FPnoBZ&)t#16K-q+gx(Q>%DK79Rf()!-^s>r!(5BCipX!`MzqD3uEIeh(WyvLJz z+q%(@U$7I*N@?UwdMkt-SRW~!IgDxc@d@|D)t%WB&G1B59>tpET3 literal 0 HcmV?d00001 diff --git a/StructureHelper/Windows/MainWindow/Circle.png b/StructureHelper/Windows/MainWindow/Circle.png new file mode 100644 index 0000000000000000000000000000000000000000..5b22c6e9263282867b5cc20cec0309e1178c0d85 GIT binary patch literal 3122 zcmbVO3se)=7M&PCi$%VE5YQMD0h`~1{3aj-f&?{)m?wyeOlBq_LNYN4Bv7gZP{4{% zOGSM}rGV5wh`O-IPr)Y^k=ClT)q;pwrA^@n~4KEfwwoD?DC@BEsH~_#F zCjfXxjLq`_V8uOv?g-z`?y?i(Kg-pHR3eR%U~NpsRDgXZsG%=BA#;BD49neQMrIoDE0|1?Bxkv|kZ)^hq>t9u}7(LiUGG6hhFc_CtKdCj0wh9QQ;0P0BoVx*Cj5L|~*ICL%zVfld+ zo`BBcG6kUDI~0(~;xU*!28&H&vLGfGVhbpvA1V<|hbo{b@q*D<#8Ut@!C=rr42IEY zq#N0ET&H9ZwIN_IK?VrY2n0=^sxiPOnnv&Wf$*m zYV8=UMn7s3VHm>%YZ)v$)3T*uAc~CPw8^@p;ovC3z>+XErZMOVENcv_O~4JfJ^}v= z>apoR1R$)HO2=ZnR*PCa7D8_bO(C{1YRGHRdReL#V?<$kJXwcep(%t+Ps?t!P>2qL z4Y*E*<4G?P75PFkB_za>7(T^2TBSj8qu%GGHJBJSU;$K+30hJ{16eW_2>J0LKX4wC z12LH+P$`b86sdoPvLO}=;_&_eC8`F64e4FP z7!75?pnxft^SG#=rSL~|NmP0w%c-MBX&JU|bd;o`43`fCBbH+kKt(L|fT7gU*Q(d} z@wXz6t~VxN1nC=!WF)#CR~U@24ihN}?_Ol*O?AllEB$&n<<08-mW8z_~pJN(=T1Rwi4tlnL z_!(XoE*8mR!djzO<8GlY0g1wDkGgy}+3cdo*c02FCzShamJCiT1k4WO%(6k*M|%%M zEu3vNIhSV&{yBGZ3pum9Qz^^i=a+a@uZmh>N1J8mQdfNoKWaSn_(x4|SKYuS$!+mm zc3q9|ar;hT4RSl{`=gJvcO8c8T^5CUM;}SA419jSHuc_v-hq-PL9);XZ?UFimmX|ZN7eg3Bhd>=(fygpPM_9!bWQygaV`NFEOAYP2QTgdaN z@K`^zE@B}sc==@?Gwap&g2TqYGcmR1 z0{Wkr6%ARkwRWw+uD12xB-OZmQ!35i3_iZpxD`?_Og>>AI-66NTd93?8Gmr4_*&J_ zo$kAyb8FRsr?n5RaHl4DbSC_>FSVvfU;jmC>4%SZT@4E1{KzRdA`BNFzG1zR^x3&_ zvedj42d96lr*yra(HPzG)!Mp$YuZkA+P*tpl2ETW-E?Saed!NHxwd!r+zeV)xAIu- z@-AW1vPfjt=ee1x^3Au{GROFnr{)AMd3OBFa^UX4_S7J@NS>lH-@E?Z^>f)rg37*E zo!G4!X3X`s+qJ;M$xT)aSfz-HPu>{t*p{)W&)ym-j{Q^@Mk_3E+>`s{w~rUoZ#HMy zxd#loB*)CUP}TQwq_@ilpWp8Dbjo{pnbfkRt=1^s7)&~QcIo1Xh`lo34-%Gf%-wbC zpB0zbU*28dICpAyt??)N)oUAy$2;Y%jERez<;4nY%*fBTv&s^s(n}iN-?%aRIOmuC zi~JwEpOa^_CiaCdn$ab4pXMQ;O*(YAqLozQKPjgmGH7PNCuNnD#VKdr=JI&0`OVFu z?BMs*m6f_vnUy&(t4r?Araol--%E^$tL^-H zS1102#un=K?fvN2)eANbnf5PcA>m z8C<$lbV`=o*V{|GsWpg?lyv?B$O?6tDEQc4kXc&l>>Ujju{lrDPOG1)ADt}hhGQR> z^!y-e_gqsE;heYQDIiF`@T<68RA>Gr-?{sy>`-SE(z+n(z}nRpa_pafvPx2z0eE?N zIZl|?n4R7*!{O{|C!_KBLu`KLGCwMkrbdw)+&>Hb?y rJ$6fW4*l#_|6JR0`jM%6_4!+C8W@rqyvX^o<$q>)XoUDkaD3+P-W;Si literal 0 HcmV?d00001 diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml b/StructureHelper/Windows/MainWindow/MainView.xaml index 17084c4..c9e1d42 100644 --- a/StructureHelper/Windows/MainWindow/MainView.xaml +++ b/StructureHelper/Windows/MainWindow/MainView.xaml @@ -11,6 +11,7 @@ xmlns:local="clr-namespace:StructureHelper.Windows.MainWindow" xmlns:enums="clr-namespace:StructureHelper.Infrastructure.Enums" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" + xmlns:sys="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" d:DataContext="{d:DesignInstance local:MainViewModel}" Title="StructureHelper" Height="700" Width="1000" MinHeight="400" MinWidth="600"> @@ -21,7 +22,6 @@ - @@ -33,50 +33,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,7 +118,7 @@ + + + + + + + + @@ -188,14 +226,7 @@ - - - -