From: Steven Abadie Date: Thu, 4 Dec 2014 05:30:30 +0000 (-0700) Subject: Update to Pronterface UI. X-Git-Tag: 14.09-1.18~33 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b308aa94a9cc4feafc3550f98f6c3c98378c50c1;p=cura.git Update to Pronterface UI. Updated source and image files for the Pronterface UI. The Extruder controls have been simplified and labeled. The Y axis controls have been flipped to match the motion of the bed. Z controls are also now labeled up and down. Celcius was added to the temperature control. --- diff --git a/plugins/PronterfaceUI/image.png b/plugins/PronterfaceUI/image.png index 835c4e3b..dc384728 100644 Binary files a/plugins/PronterfaceUI/image.png and b/plugins/PronterfaceUI/image.png differ diff --git a/plugins/PronterfaceUI/map.png b/plugins/PronterfaceUI/map.png index c07ad912..e50cf5f1 100644 Binary files a/plugins/PronterfaceUI/map.png and b/plugins/PronterfaceUI/map.png differ diff --git a/plugins/PronterfaceUI/script.py b/plugins/PronterfaceUI/script.py index e48e0d68..494a0fa5 100644 --- a/plugins/PronterfaceUI/script.py +++ b/plugins/PronterfaceUI/script.py @@ -17,14 +17,14 @@ addColorCommand(0, 0, 160, sendGCode, "G91; G1 X-1 F2000; G90") addColorCommand(0, 0, 140, sendGCode, "G91; G1 X-10 F2000; G90") addColorCommand(0, 0, 120, sendGCode, "G91; G1 X-100 F2000; G90") -addColorCommand(0, 255, 0, sendGCode, "G91; G1 Y100 F2000; G90") -addColorCommand(0, 240, 0, sendGCode, "G91; G1 Y10 F2000; G90") -addColorCommand(0, 220, 0, sendGCode, "G91; G1 Y1 F2000; G90") -addColorCommand(0, 200, 0, sendGCode, "G91; G1 Y0.1 F2000; G90") -addColorCommand(0, 180, 0, sendGCode, "G91; G1 Y-0.1 F2000; G90") -addColorCommand(0, 160, 0, sendGCode, "G91; G1 Y-1 F2000; G90") -addColorCommand(0, 140, 0, sendGCode, "G91; G1 Y-10 F2000; G90") -addColorCommand(0, 120, 0, sendGCode, "G91; G1 Y-100 F2000; G90") +addColorCommand(0, 255, 0, sendGCode, "G91; G1 Y-100 F2000; G90") +addColorCommand(0, 240, 0, sendGCode, "G91; G1 Y-10 F2000; G90") +addColorCommand(0, 220, 0, sendGCode, "G91; G1 Y-1 F2000; G90") +addColorCommand(0, 200, 0, sendGCode, "G91; G1 Y-0.1 F2000; G90") +addColorCommand(0, 180, 0, sendGCode, "G91; G1 Y0.1 F2000; G90") +addColorCommand(0, 160, 0, sendGCode, "G91; G1 Y1 F2000; G90") +addColorCommand(0, 140, 0, sendGCode, "G91; G1 Y10 F2000; G90") +addColorCommand(0, 120, 0, sendGCode, "G91; G1 Y100 F2000; G90") addColorCommand(255, 0, 0, sendGCode, "G91; G1 Z10 F200; G90") addColorCommand(220, 0, 0, sendGCode, "G91; G1 Z1 F200; G90") @@ -34,10 +34,6 @@ addColorCommand(160, 0, 0, sendGCode, "G91; G1 Z-1 F200; G90") addColorCommand(140, 0, 0, sendGCode, "G91; G1 Z-10 F200; G90") addColorCommand(255, 80, 0, sendGCode, "G91; G1 E10 F120; G90") -addColorCommand(255, 100, 0, sendGCode, "G91; G1 E1 F120; G90") -addColorCommand(255, 120, 0, sendGCode, "G91; G1 E0.1 F120; G90") -addColorCommand(255, 140, 0, sendGCode, "G91; G1 E-0.1 F120; G90") -addColorCommand(255, 160, 0, sendGCode, "G91; G1 E-1 F120; G90") addColorCommand(255, 180, 0, sendGCode, "G91; G1 E-10 F120; G90") addColorCommand(255, 255, 0, sendGCode, "G28") diff --git a/resources/images/source/Cura_Ui_Pronterface.svg b/resources/images/source/Cura_Ui_Pronterface.svg index a5d536ac..8935405d 100644 --- a/resources/images/source/Cura_Ui_Pronterface.svg +++ b/resources/images/source/Cura_Ui_Pronterface.svg @@ -45,17 +45,19 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="-6.9993696" - inkscape:cy="335.06244" + inkscape:cx="405.72322" + inkscape:cy="221.22524" inkscape:document-units="px" - inkscape:current-layer="g6977" + inkscape:current-layer="layer5" showgrid="false" inkscape:snap-global="false" inkscape:window-width="1475" inkscape:window-height="794" inkscape:window-x="287" inkscape:window-y="34" - inkscape:window-maximized="0"> + inkscape:window-maximized="0" + showguides="true" + inkscape:guide-bbox="true"> + + + + @@ -79,22 +97,106 @@ + + + + + + + + + + + @@ -579,7 +671,7 @@ @@ -673,7 +765,7 @@ @@ -786,7 +878,7 @@ @@ -828,7 +920,8 @@ + id="g4988" + transform="translate(-24.951577,-24.120598)"> + + + + + Temperature + Bed Temp + + + + + + + + + + style="display:inline" + transform="matrix(0.4896969,0,0,0.4896969,183.11149,804.87843)" + id="g4507"> + + + + + + + + id="g6979" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="path6981" /> + id="path6983" /> + id="g6985" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g6989"> + id="rect6991" /> + id="rect6993" /> + id="g6995" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + transform="translate(2.0061653e-6,0)" + id="g6999"> + id="rect7001" /> + id="rect7003" /> + id="g7005" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7009"> + id="rect7011" /> + id="rect7013" /> + id="g7015" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7019"> + id="rect7021" /> + id="rect7023" /> + id="g7025" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7029"> + id="rect7031" /> + id="rect7033" /> + id="g7035" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7039"> + id="rect7041" /> + id="rect7043" /> + id="g7045" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7047"> + id="path7049" /> + id="path7051" /> + id="g7053" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7055"> + id="path7057" /> + id="g7059" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="g7061"> + id="path7063" /> + id="path7065" /> + id="path7067" /> + id="g7069" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="rect7071" /> + id="g7073" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="rect7075" /> + id="g7077" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="rect7079" /> + id="g7081" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> + id="path7083" /> + style="fill:#9fba2d;fill-opacity:1;display:inline" + id="g7085" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> - - - - - - + id="path7087" /> - + id="g7099" + style="display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)"> - - - - - - + id="path7101" /> + + style="fill:#ffffff;display:inline" + transform="matrix(0.33610887,0,0,0.34763858,132.447,-13.3043)" /> + E + E + MM + id="g3626" + transform="translate(2,0)"> - - - - + id="g6438" + transform="matrix(0.35641332,0,0,0.32165481,59.02518,-2.74217)" + style="display:inline"> - - + + + inkscape:connector-curvature="0" + style="fill:none;stroke:#869e20;stroke-width:4;stroke-miterlimit:10" /> - - - - + id="g6446"> + + + + - - - - + id="g6456"> + + + + - - - - + id="g6466"> + + + + - - - + id="g6476"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="rect6532" + height="32.599998" + width="102.9" + y="461.10001" + x="603" + style="fill:#869e20" /> - - + id="g6534"> + id="rect6536" + height="32.599998" + width="102.9" + y="209.3" + x="603" + style="fill:#ededed" /> + + + + + + inkscape:connector-curvature="0" + style="fill:none;stroke:#869e20;stroke-width:4;stroke-miterlimit:10" /> + + + + + + + + + + + + + + + + + + + + + MM + + + id="g5"> + id="g7"> + d="m 646,940.9 h -82 c -6.6,0 -12,-5.4 -12,-12 V 372.2 c 0,-6.6 5.4,-12 12,-12 h 82 c 6.6,0 12,5.4 12,12 v 556.7 c 0,6.6 -5.4,12 -12,12 z" + id="path9" /> + + + + stroke-miterlimit="10" + d="m 646,940.9 h -82 c -6.6,0 -12,-5.4 -12,-12 V 372.2 c 0,-6.6 5.4,-12 12,-12 h 82 c 6.6,0 12,5.4 12,12 v 556.7 c 0,6.6 -5.4,12 -12,12 z" + id="path15" /> + id="g17"> + id="g19"> + + d="m 580.8,971.1 c 0,0.1 -0.1,0.1 -0.3,0.1 h -3.7 c -0.1,0 -0.3,0 -0.4,-0.1 -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 l -3.6,-5.2 -3.6,5.2 c -0.1,0.1 -0.2,0.2 -0.3,0.3 -0.1,0.1 -0.3,0.1 -0.4,0.1 h -3.7 c -0.1,0 -0.2,0 -0.3,-0.1 -0.1,-0.1 0,-0.2 0,-0.3 l 5.3,-8.1 c 0.1,-0.1 0.1,-0.2 0.1,-0.4 0,-0.1 0,-0.3 -0.1,-0.4 l -5,-7.6 c -0.1,-0.1 -0.1,-0.2 0,-0.3 0.1,-0.1 0.1,-0.1 0.3,-0.1 h 3.7 c 0.1,0 0.3,0 0.4,0.1 0.1,0.1 0.2,0.2 0.3,0.3 l 3.3,4.6 3.3,-4.6 c 0.1,-0.1 0.2,-0.2 0.3,-0.3 0.1,-0.1 0.3,-0.1 0.4,-0.1 h 3.7 c 0.1,0 0.2,0 0.3,0.1 0,0.1 0,0.2 0,0.3 l -5,7.6 c -0.1,0.1 -0.1,0.2 -0.1,0.4 0,0.1 0,0.3 0.1,0.4 l 5.3,8.1 c 0.1,0.1 0.1,0.2 0,0.3 z" + id="path23" /> + + + + + + id="g35"> + id="g37"> + d="m 566.1,350.3 c 0.1,0.1 0.1,0.2 0,0.3 -0.1,0.1 -0.1,0.1 -0.3,0.1 H 562 c -0.1,0 -0.3,0 -0.4,-0.1 -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 l -2.8,-4.7 c 0,-0.1 -0.1,-0.1 -0.2,-0.1 h -2.8 c -0.1,0 -0.1,0 -0.1,0.1 v 4.6 c 0,0.3 -0.2,0.5 -0.5,0.5 h -3.4 c -0.3,0 -0.5,-0.2 -0.5,-0.5 v -8.1 -4.1 -4.1 c 0,-0.1 0,-0.2 0.1,-0.3 0.1,-0.1 0.2,-0.1 0.3,-0.1 h 10.7 c 0.1,0 0.3,0 0.5,0.1 0.2,0 0.3,0.1 0.4,0.1 l 2.3,2.3 c 0,0.1 0.1,0.3 0.1,0.4 0,0.2 0.1,0.3 0.1,0.4 v 3.3 1.8 0.2 c 0,0.1 0,0.2 -0.1,0.4 0,0.1 -0.1,0.3 -0.2,0.4 l -2.3,2.3 3.2,5.1 z m -4.9,-12.9 h -6 v 4.2 h 2.8 2.6 0.1 0.4 v -0.3 -2.8 -1.1 z" + id="path39" /> + d="m 573.2,337.6 v 2.7 c 0,0.1 0,0.1 0.1,0.1 h 2.1 2.3 2.7 c 0.1,0 0.2,0 0.3,0.1 0.1,0.1 0.1,0.2 0.1,0.3 v 2.5 c 0,0.3 -0.2,0.5 -0.5,0.5 h -2.5 -2 -2.6 c -0.1,0 -0.1,0 -0.1,0.1 v 2.7 c 0,0.1 0,0.1 0.1,0.1 h 2 2.8 3.5 c 0.1,0 0.2,0 0.3,0.1 0.1,0.1 0.1,0.2 0.1,0.3 v 3.1 c 0,0.1 0,0.2 -0.1,0.3 -0.1,0.1 -0.2,0.1 -0.3,0.1 h -2.5 -6 -0.8 c -0.1,0 -0.3,0 -0.4,0 -0.2,0 -0.3,-0.1 -0.4,-0.1 l -2.3,-2.3 c -0.1,-0.1 -0.1,-0.3 -0.1,-0.4 0,-0.2 0,-0.3 0,-0.4 v -0.8 -8.4 -1.5 c 0,-0.1 0,-0.3 0,-0.4 0,-0.2 0.1,-0.3 0.1,-0.4 l 2.3,-2.3 c 0.1,0 0.3,-0.1 0.4,-0.1 0.2,0 0.3,-0.1 0.4,-0.1 h 0.6 6.8 2 c 0.1,0 0.2,0 0.3,0.1 0.1,0.1 0.1,0.2 0.1,0.3 v 3.1 c 0,0.1 0,0.2 -0.1,0.3 -0.1,0.1 -0.2,0.1 -0.3,0.1 h -1.9 -3.9 -2.4 c -0.2,0.1 -0.2,0.2 -0.2,0.3 z" + id="path41" /> + + d="m 614,350.3 c 0.1,0.1 0.1,0.2 0,0.3 -0.1,0.1 -0.1,0.1 -0.3,0.1 h -3.9 c -0.1,0 -0.3,0 -0.4,-0.1 -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 l -2.8,-4.7 c 0,-0.1 -0.1,-0.1 -0.2,-0.1 h -2.8 c -0.1,0 -0.1,0 -0.1,0.1 v 4.6 c 0,0.3 -0.2,0.5 -0.5,0.5 h -3.4 c -0.3,0 -0.5,-0.2 -0.5,-0.5 v -8.1 -4.1 -4.1 c 0,-0.1 0,-0.2 0.1,-0.3 0.1,-0.1 0.2,-0.1 0.3,-0.1 h 10.7 c 0.1,0 0.3,0 0.5,0.1 0.2,0 0.3,0.1 0.4,0.1 l 2.3,2.3 c 0,0.1 0.1,0.3 0.1,0.4 0,0.2 0.1,0.3 0.1,0.4 v 3.3 1.8 0.2 c 0,0.1 0,0.2 -0.1,0.4 0,0.1 -0.1,0.3 -0.2,0.4 l -2.3,2.3 3.3,5.1 z m -4.9,-12.9 h -6 v 4.2 h 2.8 2.6 0.1 0.4 v -0.3 -2.8 -1.1 z" + id="path45" /> + + + - + id="g53"> + + - + id="g59"> + + + + + + + + + + + + + + + + id="g83"> - - - + + width="97.699997" + height="78" + id="rect87" /> - + id="g89"> + + + + - + id="g97"> + + - - - - Temperature - Bed Temp - - - + id="g103"> + + + + - - - E - - E MM + id="tspan4484" + x="288.04349" + y="44.693352">Up MM + y="264.88086" + x="280.44113" + id="tspan4488" + sodipodi:role="line">Down