From: daid Date: Mon, 19 Mar 2012 15:15:16 +0000 (+0100) Subject: Only reload model/gcode if they have changed. Renambed "open gcode" button to "show... X-Git-Tag: RC1~56 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=09a4f0847c1f56db35cf5d053fc7052ddde82809;p=cura.git Only reload model/gcode if they have changed. Renambed "open gcode" button to "show result" --- diff --git a/SkeinPyPy/fabmetheus_utilities/fonts/gentium_basic_regular.svg b/SkeinPyPy/fabmetheus_utilities/fonts/gentium_basic_regular.svg deleted file mode 100644 index 418f023e..00000000 --- a/SkeinPyPy/fabmetheus_utilities/fonts/gentium_basic_regular.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SkeinPyPy/fabmetheus_utilities/images/display_line.ppm b/SkeinPyPy/fabmetheus_utilities/images/display_line.ppm deleted file mode 100644 index 4738d036..00000000 --- a/SkeinPyPy/fabmetheus_utilities/images/display_line.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -27 27 -255 -ðôôðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóðóóîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòíññÙØZäâHîìMõóP÷õRôòRíìcåéééíííññîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòíññÜÞ«ÖÔCæäHïíM÷õRüúVÿÿ\ÿÿkÿÿ\õóTáâ¦äèèëïïíññîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòëïïÎÍ@àÞEëéKõóPüúVÿÿ~ÿÿÉÿÿãÿÿÉÿÿ~õóTÐÔÔãççëïïîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòíññÄÃRÖÕ@ãáFîìLøöSÿÿ\ÿÿÉÿÿþÿÿÛÿÿþÿÿÉÿÿ\åä\ÐÔÔäèèíññîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòéííÄÃ:×Ö@äâGïíMù÷TÿÿkÿÿãÿÿÛÿýYÿÿÛÿÿãÿÿkòðQº½½ÙÜÜéííîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòåééÇÆ:ÖÕ@ãáFîìLøöSÿÿ\ÿÿÉÿÿþÿÿÛÿÿþÿÿÉÿÿ\õóQ¢¥¥ËÏÏåééîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòàääÆÄ9ÔÒ?àÞEëéKõóPüúVÿÿ~ÿÿÉÿÿãÿÿÉÿÿ~üúVõóP”——ÃÆÆàääîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòÞâ⿾6ÏÍ=ÛÙBæäHïíM÷õRüúVÿÿ\ÿÿkÿÿ\üúV÷õRìêKŽ¾ÂÂÞââîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòÞâⱯ4ÈÇ:ÕÓ?ßÝDèæIïíMõóPøöSù÷TøöSõóPïíMàÞEŽ¾ÂÂÞââîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòÞâ⢢CÀ¿7ÌÊ<ÖÕ@ßÝDæäHëéKîìLïíMîìLëéKæäHÆÄGŽ¾ÂÂÞââîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòàääÃÆÆ©¨2ÂÀ8ÌÊ<ÕÓ?ÛÙBàÞEãáFäâGãáFàÞEÑÏ@rtt”——ÃÆÆàääîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòåééËÏϜw¨¦2ÑÐ@óñRÿýYôòSæåWÿýYôòSÉÇ=ŠŠV}¢¥¥ËÏÏåééîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòéííÙÜܺ½½“––ÞÜCæäHðîNûùWòòtÿÿ×æåLfggwyy“––º½½ÙÜÜéííîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòíññäèèÐÔÔ¯²²ÞÜCëéJöôQÿýYÿÿÍÿÿãÿýYrttŽ¯²²ÐÔÔäèèíññîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòëïïãççÊÍÍÞÜCëéJöôQÿýYÿÿÑÿÿåÿýYƒƒ¨««ÊÍÍãççëïïîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòíññëïïÙÜÜÞÜCëéJöôQÿýYÿÿÑÿÿåÿýY‰ŒŒ·ººÙÜÜëïïíññîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòÞâ⃃ƒ›››±±±ÄÄÄÓÓÓüüüÓÓӎ½ÁÁÞââîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòÞâ⍎Ž™šš¬¬¬­®®¹ººÙÚÚ½½½’’¿ÃÃÞââîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòßã㋋‹ššš¬¬¬½½½ËËËñññÌÌ̓••ÀÃÃßããîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòàä䑒’š››¤¤¤¶¶¶£¤¤ÐÑÑÂÃٜœÃÆÆàääîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòâæ涸¸›››®®®ÀÀÀÂÃÃää䧨¨ž  ÆÉÉáååîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòåééÉÍ͛››±±±ÄÄÄÓÓÓüüü™œœ¦©©ËÏÏãççîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòèììÕØص¸¸“••€‚‚z||„††•˜˜²µµÓÖÖçêêîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòìððßããÈËË«®®›žž”——œžž¬¯¯ÅÈÈÜààêîîîòòîòòîòòîòòîòòîòòîòòðóóîòòîòòîòòîòòîòòîòòîòòîòòíññçëëÜààÍÑÑÃÆÆ¿ÃÃÃÆÆÌÐÐÚÞÞæééíññîòòîòòîòòîòòîòòîòòîòò \ No newline at end of file diff --git a/SkeinPyPy/fabmetheus_utilities/images/dive.ppm b/SkeinPyPy/fabmetheus_utilities/images/dive.ppm deleted file mode 100644 index 39b6e114..00000000 --- a/SkeinPyPy/fabmetheus_utilities/images/dive.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -16 16 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿìôÿØéÿÉáÿ¾Ûÿ¾ÛÿÉáÿØéÿìôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöúÿÙêÿÇÝùÐÞïÕÛãÖØÚÕ×ÙÑØáÍÛìÆÜøÙêÿöúÿÿÿÿÿÿÿÿÿÿöúÿÓæÿÓáòÙÝâèìñóöúûýþûýþòõùåéîÏÔÚÎÜîÓæÿöúÿÿÿÿÿÿÿÙêÿÓáòÖÚà÷øûÿÿÿöùüîóúíóúôøüÿÿÿóöùÇÌÓÍÛìÙêÿÿÿÿìôÿÇÝùÙÝâ÷øûÿÿÿëñùãì÷èïùèïùæïøßéöÿÿÿóöùÄÉÏÃÙõìôÿØéÿÐÝîèìñÿÿÿëñùãì÷YŒÍèïùæïøßéöX‹Ëãì÷ÿÿÿØßçÀÎßØéÿÉáÿÔÚâóöúôøüáë÷S„ÃYŒÍåîøÝèöN{´X‹Ëáë÷ñõûêïö¶½ÅÉáÿ¾ÛÿÔÖØûýþéðùRƒÀRƒÁX‹ËßéöMz³Mz´WŠÊßéöãì÷ùûý«­¯¾Ûÿ¾ÛÿÓÕ×ûýþìòúZŽÑQ€½X‹ËéðùU†ÅP~¹VˆÈÝèöáë÷ñõú§©ª¾ÛÿÉáÿÐ×ßïóøòöûäí÷YÐYŒÏàêöáë÷X‹ËX‹ÍÜçõîóúÛäדּ»ÉáÿØéÿÌÙëáåìþþÿáë÷ãì÷\ÒÝèöÝèößéö[ÑÚåõúüþ¿ÉÖµÃÔØéÿìôÿÄÚ÷ÈÌÒíñ÷ÿÿÿÝèöàêöÜçõÛæõÚåõÛæõþþÿÜä±¾ÔðìôÿÿÿÿÙêÿÉ×è·¾Æèîôþþÿïôûáë÷àêöíóúúüþÛä¬»ÉÛÙêÿÿÿÿÿÿÿöúÿÓæÿÅÒ䱸¾ÈÑÜáèñòöûîóúÖàí¸Ãҝ¤­ºÈÚÓæÿöúÿÿÿÿÿÿÿÿÿÿöúÿÙêÿÀÖò·ÅÖ¨¯·œŸ˜šœ£ª³±¿Ð¼ÓïÙêÿöúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìôÿØéÿÉáÿ¾Ûÿ¾ÛÿÉáÿØéÿìôÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/SkeinPyPy/fabmetheus_utilities/images/soar.ppm b/SkeinPyPy/fabmetheus_utilities/images/soar.ppm deleted file mode 100644 index 9fb815d7..00000000 --- a/SkeinPyPy/fabmetheus_utilities/images/soar.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -16 16 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿìôÿØéÿÉáÿ¾Ûÿ¾ÛÿÉáÿØéÿìôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöúÿÙêÿÇÝùÐÞïÕÛãÖØÚÕ×ÙÑØáÍÛìÆÜøÙêÿöúÿÿÿÿÿÿÿÿÿÿöúÿÓæÿÓáòÙÝâèìñóöúûýþûýþòõùåéîÏÔÚÎÜîÓæÿöúÿÿÿÿÿÿÿÙêÿÓáòÖÚà÷øûÿÿÿöùüîóúíóúôøüÿÿÿóöùÇÌÓÍÛìÙêÿÿÿÿìôÿÇÝùÙÝâ÷øûÿÿÿÜçõéðùèïùèïùÚåõåîøÿÿÿóöùÄÉÏÃÙõìôÿØéÿÐÝîèìñÿÿÿëñùT…ÃÚåõèïùæïøRƒÁÕãóãì÷ÿÿÿØßçÀÎßØéÿÉáÿÔÚâóöúôøüèïùS„ÃS„ÁØåôäí÷RƒÀRƒÀÔâóñõûêïö¶½ÅÉáÿ¾ÛÿÔÖØûýþìòúèïùRƒÁRƒÁVˆÈÛæõRÀR¾U†ÆÛæõùûý«­¯¾Ûÿ¾ÛÿÓÕ×ûýþëñùåîøRƒÁU‡ÆRƒÀìòúQ€¾T…ÃQ€½ìòúñõú§©ª¾ÛÿÉáÿÐ×ßïóøòöûãì÷U‡ÆRÀìòúßéöT…ÃQ€½ëñùîóúÛäדּ»ÉáÿØéÿÌÙëáåìþþÿáë÷R¾ìòúÝèöÝèöQ½éðùÚåõúüþ¿ÉÖµÃÔØéÿìôÿÄÚ÷ÈÌÒíñ÷ÿÿÿëñùÝèöÜçõÛæõéðùØåôþþÿÜä±¾ÔðìôÿÿÿÿÙêÿÉ×è·¾Æèîôþþÿïôûáë÷àêöíóúúüþÛä¬»ÉÛÙêÿÿÿÿÿÿÿöúÿÓæÿÅÒ䱸¾ÈÑÜáèñòöûîóúÖàí¸Ãҝ¤­ºÈÚÓæÿöúÿÿÿÿÿÿÿÿÿÿöúÿÙêÿÀÖò·ÅÖ¨¯·œŸ˜šœ£ª³±¿Ð¼ÓïÙêÿöúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìôÿØéÿÉáÿ¾Ûÿ¾ÛÿÉáÿØéÿìôÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/SkeinPyPy/fabmetheus_utilities/images/stop.ppm b/SkeinPyPy/fabmetheus_utilities/images/stop.ppm deleted file mode 100644 index d1b98136..00000000 --- a/SkeinPyPy/fabmetheus_utilities/images/stop.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -16 16 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùâáï³¯íª¦íª¥í¨¤ë¤ží©¥÷ÙØþüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøáàò¹²üÓÂÿÖÁÿѽÿÏ»ÿιüȷퟘòÅÃÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿøáàð·±üÔÄÿ£ÿ¯‹ÿ«‰ÿ§„ÿ ~ÿ®‘ûÃ´í¢œöÖÕÿÿÿÿÿÿÿÿÿøáßñµ¯üÑÁÿ¿ ÿª†ÿ§…ÿ¢ÿ|ÿ˜xÿoÿ¡…ûº¬ê—öÓÒÿÿÿÿÿÿüͼÿ»œÿ¥ÿ¢ÿž|ÿ™xÿ“tÿŽoÿ‰iÿ€`ÿ“xû­žå…ÿÿÿÿÿÿꝘÿ͸ÿ }ÿ|ÿ™xÿ“sÿŽnÿ‰iÿƒeÿ~`ÿxYÿpOÿª˜ârkÿÿÿÿÿÿ隕ÿıÿ˜vÿ“sÿŽnÿ‰iÿƒeÿ~_ÿyZÿsUÿnOÿgHÿ¡áohÿÿÿÿÿÿ蔐ÿ¾«ÿmÿ‰iÿƒeÿ~_ÿyZÿtUÿoPÿiKÿcFÿ\?ÿ›Šßibÿÿÿÿÿÿ抄ÿ»¦ÿ_ÿ~_ÿyZÿsUÿnPÿiKÿdFÿ^AÿY;ÿO1ÿ™‡Ý^Vÿÿÿÿÿÿ莈ü²¢ÿsÿpOÿnOÿiKÿdFÿ^AÿZ<ÿU7ÿK,ÿgNú“„Þf_ÿÿÿÿÿÿõÒÐ鎇û­Ÿÿgÿ^@ÿ^@ÿY<ÿU7ÿP3ýF(ýeJö–‰áneòÃÁÿÿÿÿÿÿÿÿÿôÌÊç†~ú¥–ÿtZÿP2ÿO0þI,úB%ù`Hô”†âpiñÀ½ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóÈÆç|tú—‰ÿ•„üúŽ}÷}ò‹}ÝYQꟛÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóÆÄàkeÜYRÜ[SÚXPÚRIÜ`Yðº·þúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/SkeinPyPy/fabmetheus_utilities/images/view_move.ppm b/SkeinPyPy/fabmetheus_utilities/images/view_move.ppm deleted file mode 100644 index d566b1e5..00000000 Binary files a/SkeinPyPy/fabmetheus_utilities/images/view_move.ppm and /dev/null differ diff --git a/SkeinPyPy/fabmetheus_utilities/images/view_rotate.ppm b/SkeinPyPy/fabmetheus_utilities/images/view_rotate.ppm deleted file mode 100644 index 49ca6bec..00000000 Binary files a/SkeinPyPy/fabmetheus_utilities/images/view_rotate.ppm and /dev/null differ diff --git a/SkeinPyPy/fabmetheus_utilities/images/zoom_in.ppm b/SkeinPyPy/fabmetheus_utilities/images/zoom_in.ppm deleted file mode 100644 index 6f4767f4..00000000 --- a/SkeinPyPy/fabmetheus_utilities/images/zoom_in.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -16 16 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôìÜÝÑҮmÏ©eΧcШjÙ»ŒóèÚÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìÜ¿Ô°p×·}æѯ÷ðåöïääάҭwÌ¡gçÓºÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôìÜÔ°påÏ©÷úýïõûêòúëóúñöûùûýßţɛcñæØÿÿÿÿÿÿÿÿÿÿÿÿÝ‘׶}÷úýëóúèñùéòùéòúêòúîõûùûýͤqÒ®„ÿÿÿÿÿÿÿÿÿÿÿÿÒ­læÑ®ðöûèñùéòùéòúêòúëóúëóúò÷üßħÒ[ÿÿÿÿÿÿÿÿÿÿÿÿϨc÷ïåëóúéòúêòúêòúëóúg¶\a°W\¨Rôë⿋Pÿÿÿÿÿÿÿÿÿÿÿÿͦböïäìóúêòúêòúëóúëóú_­V¦ÕSžKôë⾇Mÿÿÿÿÿÿÿÿÿÿÿÿͧhä̬ñ÷üëóúëóúc²Y^«Tv·mžÑ•k¬cD‹=>ƒ7ÿÿÿÿÿÿÿÿÿÿÿÿع‹Ñªvùûýïõûìôú\¨RŸÒ—šÏ’†Å}Êˆ‹Æƒ5y0ÿÿÿÿÿÿÿÿÿÿÿÿòçÙʟeÞÄ£ùûþóøüSžKM–Ee§^‹Ç…Z›S3v..o)ãÍ»ÿÿÿÿÿÿÿÿÿÿÿÿæѹȚ`Ê oÞçôëâôëâ>ƒ7‚Â}2t,ã̙Þč¼ƒOøñíÿÿÿÿÿÿÿÿÿÿÿÿñåØÑ«ƒÁZ¾‡M½…L5y00q+*k&èÕ£é×¥Ú»€¬e?÷ñíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿâ˹ÁŽXßŏçÓ àǓɛa—aFÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿáɸ¼„Q×µ}ÖµÑV¶{Qÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿáɸ®mH¹€H·yRúöôÿÿÿ \ No newline at end of file diff --git a/SkeinPyPy/fabmetheus_utilities/images/zoom_out.ppm b/SkeinPyPy/fabmetheus_utilities/images/zoom_out.ppm deleted file mode 100644 index 108f8937..00000000 --- a/SkeinPyPy/fabmetheus_utilities/images/zoom_out.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -16 16 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôìÜÝÑҮmÏ©eΧcШjÙ»ŒóèÚÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿìÜ¿Ô°p×·}æѯ÷ðåöïääάҭwÌ¡gçÓºÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôìÜÔ°påÏ©÷úýïõûêòúëóúñöûùûýßţɛcñæØÿÿÿÿÿÿÿÿÿÿÿÿÝ‘׶}÷úýëóúèñùéòùéòúêòúîõûùûýͤqÒ®„ÿÿÿÿÿÿÿÿÿÿÿÿÒ­læÑ®ðöûèñùéòùéòúêòúëóúëóúò÷üßħÒ[ÿÿÿÿÿÿÿÿÿÿÿÿϨc÷ïåëóúéòúêòúêòúëóúëóúìóúîõûôë⿋Pÿÿÿÿÿÿÿÿÿÿÿÿͦböïäìóúêòúêòúëóúëóúìóúìôúïõûôë⾇Mÿÿÿÿÿÿÿÿÿÿÿÿͧhä̬ñ÷üëóúëóúþxtüomúcb÷TVôEHñ5:î&.ÿÿÿÿÿÿÿÿÿÿÿÿع‹ÑªvùûýïõûìôúüomøÈ¿÷À·ö¶®ô«¤ó ›ì#ÿÿÿÿÿÿÿÿÿÿÿÿòçÙʟeÞÄ£ùûþóøüúcb÷TVôEHñ5:î&.ì#êãÍ»ÿÿÿÿÿÿÿÿÿÿÿÿæѹȚ`Ê oÞçôëâôëâܾ¤ÁSÖ´yã̙Þč¼ƒOøñíÿÿÿÿÿÿÿÿÿÿÿÿñåØÑ«ƒÁZ¾‡M½…L»†R»LÛ¿‡èÕ£é×¥Ú»€¬e?÷ñíÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿâ˹ÁŽXßŏçÓ àǓɛa—aFÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿáɸ¼„Q×µ}ÖµÑV±rEÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿàǶ¥\3¹€H³sKøòïÿÿÿ \ No newline at end of file diff --git a/SkeinPyPy/newui/preview3d.py b/SkeinPyPy/newui/preview3d.py index 14d3b0e9..51ba092c 100644 --- a/SkeinPyPy/newui/preview3d.py +++ b/SkeinPyPy/newui/preview3d.py @@ -33,6 +33,7 @@ class previewPanel(wx.Panel): self.init = 0 self.triangleMesh = None self.gcode = None + self.modelFilename = None self.machineSize = Vector3(float(profile.getPreference('machine_width')), float(profile.getPreference('machine_depth')), float(profile.getPreference('machine_height'))) self.machineCenter = Vector3(0, 0, 0) @@ -92,40 +93,39 @@ class previewPanel(wx.Panel): self.glCanvas.Refresh() def loadModelFile(self, filename): + gcodeFilename = filename[: filename.rfind('.')] + "_export.gcode" + if self.modelFilename != filename: + self.modelFileTime = None + self.gcodeFileTime = None + self.modelFilename = filename - self.gcodeFilename = filename[: filename.rfind('.')] + "_export.gcode" - #Do the STL file loading in a background thread so we don't block the UI. - thread = threading.Thread(target=self.DoModelLoad) - thread.start() - - def loadGCodeFile(self, filename): - self.gcodeFilename = filename + self.gcodeFilename = gcodeFilename #Do the STL file loading in a background thread so we don't block the UI. - thread = threading.Thread(target=self.DoGCodeLoad) + thread = threading.Thread(target=self.doFileLoad) thread.start() - def DoModelLoad(self): - self.modelDirty = False - triangleMesh = fabmetheus_interpret.getCarving(self.modelFilename) - triangleMesh.origonalVertexes = list(triangleMesh.vertexes) - for i in xrange(0, len(triangleMesh.origonalVertexes)): - triangleMesh.origonalVertexes[i] = triangleMesh.origonalVertexes[i].copy() - triangleMesh.getMinimumZ() - self.triangleMesh = triangleMesh - self.updateModelTransform() - wx.CallAfter(self.updateToolbar) - wx.CallAfter(self.glCanvas.Refresh) + def doFileLoad(self): + if os.path.isfile(self.modelFilename) and self.modelFileTime != os.stat(self.modelFilename).st_mtime: + self.modelFileTime = os.stat(self.modelFilename).st_mtime + triangleMesh = fabmetheus_interpret.getCarving(self.modelFilename) + triangleMesh.origonalVertexes = list(triangleMesh.vertexes) + for i in xrange(0, len(triangleMesh.origonalVertexes)): + triangleMesh.origonalVertexes[i] = triangleMesh.origonalVertexes[i].copy() + triangleMesh.getMinimumZ() + self.modelDirty = False + self.triangleMesh = triangleMesh + self.updateModelTransform() + wx.CallAfter(self.updateToolbar) + wx.CallAfter(self.glCanvas.Refresh) - if os.path.isfile(self.gcodeFilename): - self.DoGCodeLoad() - - def DoGCodeLoad(self): - gcode = gcodeInterpreter.gcode(self.gcodeFilename) - self.gcodeDirty = False - self.gcode = gcode - self.gcodeDirty = True - wx.CallAfter(self.updateToolbar) - wx.CallAfter(self.glCanvas.Refresh) + if os.path.isfile(self.gcodeFilename) and self.gcodeFileTime != os.stat(self.gcodeFilename).st_mtime: + self.gcodeFileTime = os.stat(self.gcodeFilename).st_mtime + gcode = gcodeInterpreter.gcode(self.gcodeFilename) + self.gcodeDirty = False + self.gcode = gcode + self.gcodeDirty = True + wx.CallAfter(self.updateToolbar) + wx.CallAfter(self.glCanvas.Refresh) def updateToolbar(self): self.layerSpin.Show(self.gcode != None) diff --git a/SkeinPyPy/newui/sliceProgessPanel.py b/SkeinPyPy/newui/sliceProgessPanel.py index 59b095ab..f9d33a94 100644 --- a/SkeinPyPy/newui/sliceProgessPanel.py +++ b/SkeinPyPy/newui/sliceProgessPanel.py @@ -82,7 +82,7 @@ class sliceProgessPanel(wx.Panel): self.sizer.Add(self.logButton, 0) if result.returnCode == 0: self.statusText.SetLabel("Ready.") - self.showButton = wx.Button(self, -1, "Show GCode") + self.showButton = wx.Button(self, -1, "Show result") self.Bind(wx.EVT_BUTTON, self.OnShowGCode, self.showButton) self.sizer.Add(self.showButton, 0) else: @@ -133,7 +133,6 @@ class WorkerThread(threading.Thread): return line = p.stdout.readline() self.returnCode = p.wait() - self.gcodeFilename = self.filename[: self.filename.rfind('.')] + "_export.gcode" logfile = open(self.filename[: self.filename.rfind('.')] + "_export.log", "w") for logLine in self.progressLog: logfile.write(logLine)