From 4463d1672718f85a6b5fd56bc94af5c41004b1ad Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Wed, 15 Jul 2015 17:19:20 -0400 Subject: [PATCH] Revert temperature field to the way it was before --- Cura/gui/printWindow.py | 50 ++++++------------ .../images/print-window-temperature-bed.png | Bin 1575 -> 1263 bytes .../images/print-window-temperature-unit.png | Bin 0 -> 514 bytes resources/images/print-window-temperature.png | Bin 2256 -> 1947 bytes 4 files changed, 17 insertions(+), 33 deletions(-) create mode 100644 resources/images/print-window-temperature-unit.png diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 077c5a2a..b1af0de8 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -1,6 +1,7 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx +from wx.lib.intctrl import IntCtrl import power import time import sys @@ -648,10 +649,10 @@ class printWindowAdvanced(wx.Frame): resources.getPathForImage('print-window.png'))), (0, 0)) self.temperatureBitmap = wx.StaticBitmap(self.panel, -1, wx.BitmapFromImage(wx.Image( resources.getPathForImage('print-window-temperature.png'))), (0, 0)) - self.temperatureField = TemperatureField(self.panel) + self.temperatureField = TemperatureField(self.panel, self._setHotendTemperature) self.temperatureBedBitmap = wx.StaticBitmap(self.panel, -1, wx.BitmapFromImage(wx.Image( resources.getPathForImage('print-window-temperature-bed.png'))), (0, 0)) - self.temperatureBedField = TemperatureField(self.panel) + self.temperatureBedField = TemperatureField(self.panel, self._setBedTemperature) self.temperatureGraph = TemperatureGraph(self.panel) self.progress = wx.Gauge(self.panel, -1, range=1000) @@ -673,10 +674,10 @@ class printWindowAdvanced(wx.Frame): self.sizer.Add(self.motorsOffButton, pos=(1, 5), flag=wx.LEFT|wx.RIGHT, border=2) self.sizer.Add(self.movementBitmap, pos=(2, 0), span=(2, 3)) self.sizer.Add(self.temperatureGraph, pos=(4, 0), span=(4, 2), flag=wx.EXPAND) - self.sizer.Add(self.temperatureBitmap, pos=(4, 2), span=(1, 1), flag=wx.EXPAND) - self.sizer.Add(self.temperatureField, pos=(5, 2), span=(1, 1), flag=wx.EXPAND) - self.sizer.Add(self.temperatureBedBitmap, pos=(6, 2), span=(1, 1), flag=wx.EXPAND) - self.sizer.Add(self.temperatureBedField, pos=(7, 2), span=(1, 1), flag=wx.EXPAND) + self.sizer.Add(self.temperatureBitmap, pos=(4, 2)) + self.sizer.Add(self.temperatureField, pos=(5, 2)) + self.sizer.Add(self.temperatureBedBitmap, pos=(6, 2)) + self.sizer.Add(self.temperatureBedField, pos=(7, 2)) self.sizer.Add(self._termLog, pos=(2, 3), span=(5, 3), flag=wx.EXPAND) self.sizer.Add(self._termInput, pos=(7, 3), span=(1, 3), flag=wx.EXPAND) self.sizer.Add(self.progress, pos=(8, 0), span=(1, 6), flag=wx.EXPAND|wx.BOTTOM) @@ -735,27 +736,6 @@ class printWindowAdvanced(wx.Frame): self.Fit() self.Refresh() - def script_addTextButton(self, r_text, g_text, b_text, r_button, g_button, b_button, button_text, command, data): - x_text, y_text, w_text, h_text = self._getColoredRect(r_text, g_text, b_text) - if x_text < 0: - return - x_button, y_button, w_button, h_button = self._getColoredRect(r_button, g_button, b_button) - if x_button < 0: - return - from wx.lib.intctrl import IntCtrl - text = IntCtrl(self, -1) - text.SetBounds(0, 300) - text.SetPosition((x_text, y_text)) - text.SetSize((w_text, h_text)) - - button = wx.Button(self, -1, _(button_text)) - button.SetPosition((x_button, y_button)) - button.SetSize((w_button, h_button)) - button.command = command - button.data = data - self._buttonList.append(button) - self.Bind(wx.EVT_BUTTON, lambda e: command(data % text.GetValue()), button) - def OnConnect(self, e): self._printerConnection.openActiveConnection() @@ -953,20 +933,24 @@ class TemperatureField(wx.Panel): def __init__(self, parent, callback): super(TemperatureField, self).__init__(parent) self.callback = callback - + self.SetBackgroundColour(wx.WHITE) - self.sizer = wx.BoxSizer() - self.SetSizer(self.sizer) - self.sizer.SetOrientation(wx.HORIZONTAL) self.text = IntCtrl(self, -1) self.text.SetBounds(0, 300) - self.sizer.Add(self.text, 1, flag=wx.EXPAND) + self.text.SetSize((60, 25)) + + self.unit = wx.StaticBitmap(self, -1, wx.BitmapFromImage(wx.Image( + resources.getPathForImage('print-window-temperature-unit.png'))), (0, 0)) self.button = wx.Button(self, -1, _("Set")) - self.sizer.Add(self.button, 0) + self.button.SetSize((35, 25)) self.Bind(wx.EVT_BUTTON, lambda e: self.callback(self.text.GetValue()), self.button) + self.text.SetPosition((0, 0)) + self.unit.SetPosition((60, 0)) + self.button.SetPosition((90, 0)) + class TemperatureGraph(wx.Panel): def __init__(self, parent): diff --git a/resources/images/print-window-temperature-bed.png b/resources/images/print-window-temperature-bed.png index d5cba95123ebdcf38803cbfbe7b9548a501facbf..f81095974be464732752e70b822e541a7c00ec4f 100644 GIT binary patch delta 1231 zcmV;=1Tg!j4DSgciBL{Q4GJ0x0000DNk~Le0001e0000P2nGNE0378ZX^|l^e-9N0 zB1JQPqyPW}d`Uz>RA}Dqnq5p3R}{y8JF}~Nii*mY$nqfz3ka^rS|L~)G?j!ltw~$^ z6+=^7)20uS)~Ci26Q67}wf3cHO`Fuzn8wiRL&Y`)iUCm(E2va7MQ9MDAo3x*J3D=V zT^MFoNPJN6{$6(G%(-XIz5hFRf6m;jNmW%9!Bd4KhCqle5TXl&=mH_SK!`4wC76wj z-&7RSd#_Drmn92@t9P+BqZ9y_dzdeNT#Hxr7zTG{?qGwX41hz&oQ#b2>l2XYv&s1x zSt&0EO!D`JeVo7go#8cEvasuoCKRuSgGU_!b6IOIWn=Dc0KPh2z~D#^f8ilf?0D%6 zvOG`Y+thlD({+1LQQ73&!)n{>c$87Y__AcinfV?CIUmh#(OvFA6vd^pD~gLV=k^jF z8cmwD7_aKV?HLXjeDbwXSKyeZ{`{B)q0uD7tT&AFz%^jl*4JKD!Ru9KoQp4B|NYyv z-1>#Al&zCIRqC&NjYk;;fAIgRs&RZpaZ%HFfbftgvQuB3y`uYAzv=_h5{v!kC#%co z?z=`$-*wWg#Ts9GVhJk~Hfd~27us|&o^)?#ed=cnY7Y8bnr<%mY~f3}V)!&OeRYGjnM zBH9T+WnDP~L;rH;zn0nkr27aBUP5F<@`STFXlzNFvK#_LMcT0^mP~uY=*Uc-S+x^@ zkq3R$UOF^w8*5BH)|h;)=y8QOGv77zU$!`XM!5jo>22nA*E!;&^TsE^w=?KN7O5*X z15kbOa~PTf?{puPfA!^5)|YE+VIfiEq`s!}{o}%Zsv8eX4E!P++e?0aES;)pJVUtnu3eF)-BWf3iKE(YaB``3RoBka?C+ z|M}oZ&-jr^=c}p;iZU@!zIWl{V5YgG#23-}&#$z$S8{K#f0KshBLE~Xe~!P~D+9)_ zy0D+B3;VSXL-5kMA$p;s3`g3V{`2ooZKbpOBA2coWqtOC8sCk%yIGg@{u9xuLPr_- zQ}Qz+YH>QlBfWHVpQonr09S9F1Yoso+e1a4ip{!(by+*-hUoW)x-I={wiKa71PJfzxw6ngt_803^Bq)-I zu;p`WN6st<8#x(HfTk`jj7+WxHvSVVH z#_uibiZY|G3gcWt#`_tBSq>t{whe%JmQb=+zT(eo@_kIEiTDuR0wKCUh%R_y`5zmLmY-WzCvN}%002ovPDHLkV1iQ}Sz!PG delta 1545 zcmV+k2KM>y38xGpiBL{Q4GJ0x0000DNk~Le0001%0000P2nGNE0MqB!?~x%ge-0Ec z2zsj&iU0rwv`IukRA}DqnrloHR}{y8`#^cgDk!Wh$b!fMf+9Xv!BB0`R#Mtj6RoYb zhNiZ*O`B+1KN&TqrfF<6rS?nH8k=frnpUlvrb3N^81RKyL8Y!Jf<@4R$a8mRryqb_ zhS^1;ZLE6#$!2rUoO|Znx&M3Sf1H!i$g(UWAn-3kD;|M>AeMk2mVgINXZKULX1&<< z{|@zym6Vk4#8y|v_$VuxQ{KQ7J`n)P<>0{4Pq5u6#aEIWXPVB!>`fwK33wpOF7_SS zK+C-bGA1vhvAKqQM>ZhKE?h1rKNqf}(pE^9y^U@kzxJ+X5wQf6u+^2(e{%0H-d(bX zQ6VN`BGcJ*=tFFEW%%iaQ+@sTeQjvaJXys0W`7QM?%Gsxoz{=6DXW=2F%JN{qk}Jg zn2t+!dNpoMS;;f$YXHdKW2LjZMeTrYIP$x80niW{5=C?CO@;1~=RPCA-=Ok2C?NF7 zB9`6Jh9ucla!ImNcybdXf{Y}Zb8yK{9L^4(#`|CEw)?hu==ev3e*_tc8JpqNPM5va z>)gKivJ5VlG-O};?6usxK~>EGQsWo(e~D3c;cJ{yPr}{zFU#KTOOl=9@~w;rj9_xY z5)ZKq(Zr9N#qM8M6FDY{`o>D)$IT+t5UnDX*)$FP0CGRk$$Q46_ehM*agPrct)a2` z5>3sQNi^pubdzIqf0+<7PazvK(xS3y3QuQ3bau~XOP!RQ%SV=7+-|wzlUT`dxr`bS zgTvWDNyV1{#754>9GQt$t4FKVf#lIoH0NM3KR>{i1h2MFRqap^%T{;HYqVBGzlnK_ zGg<*CDBVbF`%P~BU8T}nJpWTJUn}DBwIZykOR$);L{-=me~L#FW*F~L*8BH_e=nyi zA}pEY*xdWx&={7&tVyc?=pF_Kk97&@kF?J4#v2#Sbp+5@BHd0WwQ6UQsj36!H z6_xJMGg~Msf8Xla+))-*aJeK-RqY_!ID^|Q z)zs7%yXC&n+FtLDP)}oz>Y<4hFnlD#{DR!$w$3JZy`nC!B_zqS8GX6Qqbc===1Y8Z zHr3aEqq??$yKVKHs@ws<_^4<3v$nve{bOggaO}($f8~J-7$ev;RAObNuOU5gnS1=* zp+(d;p5@%--DFIDU!gm9+FE9&zVp9WR95;LG6(qQ4H2P9badXKuJJU*B4XWZZ%`zq4o6Q_B)J?a-KOShs%sA`WMPJQ!VGaL zz4A-De|oCVL8`ci!JU>XUVIs^$QS#NW?4#I<7xi5@)H1tU=wksX9l%DEqMhqCcf#8 z-XTF_(P)O=Yu0F#5r5nFxoEZOt$3U}?}HNS#QE)Gx6EFlDdwW~paCUjsdz?G(UZ0>|7vSTh>6kP1W0K=u?3t|5dp&9Wo0om? z>#Zo&3ACOCnVX4?oIQk-u65^kT8&PXi0cOF1u1|LindYwOMmZbm;^9y3~gvD;Z zU;5uiqw(1H(+51%Ll5*H$?_NSF$5cju-?ZL8u6juql4Yip=y>YiYNaNLW05tu>=GL veH97_2x18cVhIRh2?z*c2?$~dJSF%CPx~OV?tk@)00000NkvXXu0mjfWkC6j diff --git a/resources/images/print-window-temperature-unit.png b/resources/images/print-window-temperature-unit.png new file mode 100644 index 0000000000000000000000000000000000000000..d16bc7b43c9857d02272be165aebfe5d16ddcdb1 GIT binary patch literal 514 zcmV+d0{#7oP)X1^@s6CN-WK00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-vBNQ{kS|nH#1!8X}rwTpfvw_Hs?9#{CZC3oF2ipZJR%kgFjLc{QtqyN5BAeFXwwjRHQ0@(Ij{-ut_!dNd) z4EHbM)XGp5gY~UhqOmZlY-B(k4hcaJvP-SF@(25>Oe9g^_+ppt_6bfdLr9{6ugc`+ z?kpp4(Z7wZmKLVDbj?j)r=PvZDtnPt00z3I(KUBgpe$*H?drkq8O*kEqE`nr)%D|Y zdVg=6Tuv`ttz*T__4B39MK|$NRK>`$>zbQVqr7lnQOtDR2+kL7bA6@SiVhlTdcXC{ zb#pm#f3eKu@DeS)K_p2<6y*<(rj+EAPbmJmir}BpJ9BVvAC|1YBLDyZ07*qoM6N<$ Eg6x9iqyPW_ literal 0 HcmV?d00001 diff --git a/resources/images/print-window-temperature.png b/resources/images/print-window-temperature.png index a9ba4c85f5f84f2d8b2b5190608eb0de1211b3dd..d1e4449911b43c55c669e911a2575048e9474cf1 100644 GIT binary patch delta 1920 zcmV-`2Y>j`5t|PoiBL{Q4GJ0x0000DNk~Le0001e0000P2nGNE0378ZX^|l^e-9N0 z3UG$jUH||GC`m*?RA}Dqnrl#$*BQru@4maR7Z#W0ev!)ni`?WUVnnPm38syX))+O( zBzBsZI+JNl+Q~HWQzz|*)TZf7jFS&(Y(uP5bDN~5>ZDkygQih10s?YTKtb*-ESKdX zY(KEP!^^&llxjMey#G&op7;Nre|^sRpYuG=IlF?(<#M6oI|Yq81*+&ORMAzaqN`9v zSD}io;#&f(lCf`~iH4j1P<%lU1TvGJK=0#ERpW<@IC~X&R{vO%V!sbSeak8O9W98W z54kBnLJ&k5cVcpc%h!$qEKVUpxD14Xo!m}Ak>-yK)<7z`j*pPe|=3)*n!Cq z#E7$p>ZXrTI-&ZT!by$aHqYv!vf%?p$NFXc>3uC^B<@5IX7)>E!*LmBE`ltHBt}1o z-Opxb3s}y8akv z%U=T^!?sHj-CO_XD-W@I)B8jQXVKn$c|l(zf-^B0g6J7&;B5JCz4E&HYbnekJnv-%<|C8ZAHEcoWz`9-01fBQY_v#-wV(VxW}ji{L!`q;z}BhDVay7~@zX?rmlg6SP-k^~R3 z*f8n?0C0}m>9IFZ)%X#4X?qE>*znc)F+MrO^z;-i*OXfv5kU~qX^l(IyBbk8hr^@Y zj86_zT7FOxeg1rFG@@+mK3db_!+WM}H<`BG037}xAIHdTf70T&vSs}rysYR#wrx1H zsKK;#m($r-O;}+1Oz3a@g2CbT1>aej_!t{k{StuBN`FRe^9iP1cRYBzivCRCviQ6D zu)C<30RI>%JfA%OG62)lGonqq#RK?W_Rq1!YyzP1W(gmi+3Vg6lK|}7Q3}A->z{Js z+=~D_yY)1If0l&*DesyL!92J9jMVpgNyPV&#jhf z(PGqF86NFc?7yM)G<}2D0qE?lmcrM3T&(${ti2|EpQ7l0FMA1{)&RiJXs2wk&PQ40 zA-=9Z2Ed4y+6SpT^)DAhlz{A5iS?R@WsD z+xqNZU@`=G7I=L%|CeLcovCqdw4alUCF&{4`;{U;FKw@^hKLSdv-I%37z78{D9CzY zQQYhmPjd47%T(08&-mmJ09i>-P;&8AukVqAw<=r^Ro>VveDr zt{CUIodEwB@-v=SfR5fOuND1bG55&ma!oJD&CmQPlao#|B8IsMz5B$c1n;f@=l8e8_Ic|5K=i`WtSi4~VQK75YT=4o` zfBpFQ%yWoyQi_1U=7QG=u_nuS=?OcCjmXDr4CT~?1K1s{R5yJ>dcva~eI`V0lnOaN zL&%aupL;J+{P}k2WHdhEke+K4>Yswl{Ro1{@Mssc%_q3p^a*Ry_hI#q_23>m{iG~C z2?%U2d>e~7`u>PMJ~2dhf1S*xbSW@NeKnjde+^sACVX{%_dHZ5EH5NFYz;R%|E=iHhMbo?F0AIFF!unBw@R42 z(3Q(Wq}R0Ja+B8v)wf~<1c*V_-k35R|Osr54O$*a8lzL4X#*Bo+`0a$Wd7S702`bOlNls7Lz9nX1z?J zbrArz&Ia}ze3e#Pt<&$r0+U&@=>5qNtNBhPH4*v-NWmSi1u~i|8dQxM5h9HPC*}ncxE?n6I*zxmbkRtqK;W{F9L!zrnHtI z-xNapQl+uR)-ozRU*oasMZxQ*2dcN63@gPRQ(CbTusCkczmo5nlk9MAu~Q@PtMm&r=qB9ZFQ z={G4X-=`>hv!Q@RbGHHlCkp;RS5LE|Tx9TkriMOFT~ncCqctoWPhA86S8I=R>f*4s zr^Kv7)aaoN4vbF2Af0ha72oFd`E9xn(_!lX$Pf>C;7p4T>$$OG@ zHA&Xh0Brv_16$`U;v<)kGw)AMJTr@>^S4cE!rF#>>YI!4_evNJlht3-)^T&fZ>CRO z!Gf8;2H=YmuX6eN0fy`Y4sxrq|Bly`$h+FGI(ru$e{Nw?C_8le4FHCQhKVsWLJ)u- zCI1p@*g^m*ZshXm(G60<3$Std2>>o#-OquOuK}=r$q~HVqwXvBv6y^#Y1vWf`OA~9 zQF3*^;<^EzU-StUlh1dW!(^Po?8G%3%iF=Ryd3~!B(23{oZ=v>(;6RaRXFMeqdA2V zn(kC^f3|3c?An|a_oCBp&X@d+oO$n!{QmHPC88J0{)yT6ZG{rzKZ{`Bl!w!|8M9VF zBR=#bJpb}X=yjGcVQ{YGyc1zw$_pgNETQto8KOex;9~ZAblMG#tz{0eJ|$+YL&%)s z5=>i1Ev45Fl9l=d6PyE5fwJT-#Y=5!GrqdVlG_SLyN6yIH3*Arn#-s ze<`tAY*mu%=!U3}t_0`-y@94S7zrtejc1-G82ALF(gSC3D8+Ny#QpdyYe=-=Ls$H@*Gs0L+Mf zmfXCzoqpqL_9r|rLso6YL@ZV$)?{+5fB49yxVwf?P`Zom-c~%^!pKN`MNu}XI<6*;XGCyTM|4ritMC^C|ML4SX@bQ8x#E|KlScw&9m9P5!M*0r1e;lnR}DjN&( zP3Fnjzjcs}iO3;0?>BV!wvP0>A_xzhGok)qznLt~eD|()e0KCD#4+JlKwxp^f4lg4 z#>nInqLvdLn1QR=kHcrS&}yruxbkxnqMmlp85O)hO5R;ezV}3|v3CT)AqXNJUAMV>{Q#FLKPNq5Bc5*I4zhcXJSPj~0s_mjcHr(B`ap5bX&zrXJxxLBuHjoIcAa9rbT4RbyXG*~)7R!y zKGC|03uXV{c5?~G^WVW5wh)8P<$-%|R7e(~{^{JP|F5Dw^HW}TXc~`2R_YciYI5lx z=qC5v+pK(Ir(yx+a4!8F_iVE$%BivY;Lq>B^F9`{;?~pM+p3rd&PjZQfA-FL<<9$* z2_eFp^ZijM?akfQIQ&D*#B1eF0l%9f3ZH4*JKAjYp7g3UiY-Iqg1s zx((am;~p)AYab7*l&j@rzDHU0VF2#5-@wl^7FV-BnKL$Hx7+dYoHi!pM>98R6M`V% z<`N{E%g-xLdS@|uk1N$pf2@3BCk3Uu=pX1Fm!C$-!g^Fl78*fBr!`4rbG7)hbp8j_ zH5EyYY|y(B9x!LZwYymY?wMF2e$#m@IE`zy=kBTVE~x(?RpGpV=wtt}x42q+&MAQ+ zgVR}&{X3OdDjp8h|6{38iKRj%mI{?vDpaV%Qt<=9{{T}T&DFks4wdQv0000