diff --git a/plotter-app/app.pyZone.Identifier b/plotter-app/app.pyZone.Identifier deleted file mode 100644 index fe8c267..0000000 --- a/plotter-app/app.pyZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp2.zip diff --git a/plotter-app/gcode_test.py b/plotter-app/gcode_test.py index 192903c..b3ad360 100644 --- a/plotter-app/gcode_test.py +++ b/plotter-app/gcode_test.py @@ -9,7 +9,7 @@ gcode = Gcode( mm_per_px=0.1, # Conversion factor: mm per pixel speed=1000, # Speed in mm/min machine=machine_type, - max_s=255 # Laser power (only for LASER machines) + ) # Draw a line from (10, 20) to (30, 40) diff --git a/plotter-app/insect-010001.svgZone.Identifier b/plotter-app/insect-010001.svgZone.Identifier deleted file mode 100644 index fe783b7..0000000 --- a/plotter-app/insect-010001.svgZone.Identifier +++ /dev/null @@ -1,4 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=https://cloud.erg.school/apps/files/?dir=/_plotter_erg&fileid=582497 -HostUrl=https://cloud.erg.school/remote.php/webdav/_plotter_erg/insect-010001.svg?downloadStartSecret=9gujgcmgcqh diff --git a/plotter-app/requirements.txt b/plotter-app/requirements.txt new file mode 100644 index 0000000..c7c73ba --- /dev/null +++ b/plotter-app/requirements.txt @@ -0,0 +1,13 @@ +blinker==1.9.0 +click==8.1.7 +Flask==3.1.0 +Flask-FlatPages==0.8.2 +itsdangerous==2.2.0 +Jinja2==3.1.4 +Markdown==3.7 +MarkupSafe==3.0.2 +pyserial==3.5 +PyYAML==6.0.2 +six==1.16.0 +svg-to-gcode==1.5.4 +Werkzeug==3.1.3 diff --git a/plotter-app/static/style.css b/plotter-app/static/style.css index 197769c..63c859e 100644 --- a/plotter-app/static/style.css +++ b/plotter-app/static/style.css @@ -6,8 +6,6 @@ body { } - - .form-block { background-color: ; display: flex; @@ -63,7 +61,7 @@ input:invalid { input:valid { border: 2px solid black; border-radius: 4px; - width: 50%; + width: 80vw; font-size: 1em; } diff --git a/plotter-app/streamer.pyZone.Identifier b/plotter-app/streamer.pyZone.Identifier deleted file mode 100644 index fe8c267..0000000 --- a/plotter-app/streamer.pyZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp2.zip diff --git a/plotter-app/svgToGcode.pyZone.Identifier b/plotter-app/svgToGcode.pyZone.Identifier deleted file mode 100644 index fe8c267..0000000 --- a/plotter-app/svgToGcode.pyZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp2.zip diff --git a/plotter-app/templates/form.html b/plotter-app/templates/form.html index 4b7f984..3db521b 100644 --- a/plotter-app/templates/form.html +++ b/plotter-app/templates/form.html @@ -7,7 +7,7 @@
-

Text:

+

Textes:

diff --git a/plotter-app/templates/form.htmlZone.Identifier b/plotter-app/templates/form.htmlZone.Identifier deleted file mode 100644 index ff50688..0000000 --- a/plotter-app/templates/form.htmlZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp (1).zip diff --git a/plotter-app/templates/form.htmlZone.IdentifierZone.Identifier b/plotter-app/templates/form.htmlZone.IdentifierZone.Identifier deleted file mode 100644 index fe8c267..0000000 --- a/plotter-app/templates/form.htmlZone.IdentifierZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp2.zip diff --git a/plotter-app/templates/index.html b/plotter-app/templates/index.html index bbe95a5..143ede8 100644 --- a/plotter-app/templates/index.html +++ b/plotter-app/templates/index.html @@ -5,7 +5,7 @@ -

Plotter app

+

Plotter app - Wallter

{% block content%} {% endblock %} diff --git a/plotter-app/templates/index.htmlZone.Identifier b/plotter-app/templates/index.htmlZone.Identifier deleted file mode 100644 index ff50688..0000000 --- a/plotter-app/templates/index.htmlZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp (1).zip diff --git a/plotter-app/templates/index.htmlZone.IdentifierZone.Identifier b/plotter-app/templates/index.htmlZone.IdentifierZone.Identifier deleted file mode 100644 index fe8c267..0000000 --- a/plotter-app/templates/index.htmlZone.IdentifierZone.Identifier +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\Sohel\Downloads\WebApp2.zip diff --git a/plotter-app/test_gcode-nath.gcode b/plotter-app/test_gcode-nath.gcode new file mode 100644 index 0000000..81eb137 --- /dev/null +++ b/plotter-app/test_gcode-nath.gcode @@ -0,0 +1,74 @@ +G21 ;Unit to mm +G90 ;Absolute positioning + +F1000 +S255 +M3 + +G0 X1.4285714285714288 Y7.5 +G1 X1.4285714285714288 Y2.5 +G0 X1.4285714285714288 Y6.071428571428572 +G1 X2.5 Y7.142857142857143 +G0 X2.5 Y7.142857142857143 +G1 X3.214285714285715 Y7.5 +G0 X3.214285714285715 Y7.5 +G1 X4.2857142857142865 Y7.5 +G0 X4.2857142857142865 Y7.5 +G1 X5.0 Y7.142857142857143 +G0 X5.0 Y7.142857142857143 +G1 X5.357142857142858 Y6.071428571428572 +G0 X5.357142857142858 Y6.071428571428572 +G1 X5.357142857142858 Y2.5 +G0 X12.142857142857146 Y7.5 +G1 X12.142857142857146 Y2.5 +G0 X12.142857142857146 Y6.42857142857143 +G1 X11.42857142857143 Y7.142857142857143 +G0 X11.42857142857143 Y7.142857142857143 +G1 X10.714285714285715 Y7.5 +G0 X10.714285714285715 Y7.5 +G1 X9.642857142857144 Y7.5 +G0 X9.642857142857144 Y7.5 +G1 X8.928571428571429 Y7.142857142857143 +G0 X8.928571428571429 Y7.142857142857143 +G1 X8.214285714285715 Y6.42857142857143 +G0 X8.214285714285715 Y6.42857142857143 +G1 X7.8571428571428585 Y5.357142857142858 +G0 X7.8571428571428585 Y5.357142857142858 +G1 X7.8571428571428585 Y4.642857142857143 +G0 X7.8571428571428585 Y4.642857142857143 +G1 X8.214285714285715 Y3.5714285714285716 +G0 X8.214285714285715 Y3.5714285714285716 +G1 X8.928571428571429 Y2.8571428571428577 +G0 X8.928571428571429 Y2.8571428571428577 +G1 X9.642857142857144 Y2.5 +G0 X9.642857142857144 Y2.5 +G1 X10.714285714285715 Y2.5 +G0 X10.714285714285715 Y2.5 +G1 X11.42857142857143 Y2.8571428571428577 +G0 X11.42857142857143 Y2.8571428571428577 +G1 X12.142857142857146 Y3.5714285714285716 +G0 X15.35714285714286 Y10.0 +G1 X15.35714285714286 Y3.9285714285714293 +G0 X15.35714285714286 Y3.9285714285714293 +G1 X15.714285714285717 Y2.8571428571428577 +G0 X15.714285714285717 Y2.8571428571428577 +G1 X16.42857142857143 Y2.5 +G0 X16.42857142857143 Y2.5 +G1 X17.142857142857146 Y2.5 +G0 X14.285714285714286 Y7.5 +G1 X16.78571428571429 Y7.5 +G0 X19.28571428571429 Y10.0 +G1 X19.28571428571429 Y2.5 +G0 X19.28571428571429 Y6.071428571428572 +G1 X20.35714285714286 Y7.142857142857143 +G0 X20.35714285714286 Y7.142857142857143 +G1 X21.071428571428573 Y7.5 +G0 X21.071428571428573 Y7.5 +G1 X22.142857142857146 Y7.5 +G0 X22.142857142857146 Y7.5 +G1 X22.85714285714286 Y7.142857142857143 +G0 X22.85714285714286 Y7.142857142857143 +G1 X23.21428571428572 Y6.071428571428572 +G0 X23.21428571428572 Y6.071428571428572 +G1 X23.21428571428572 Y2.5 +M5 diff --git a/plotter-app/test_gcode.gcode b/plotter-app/test_gcode.gcode index 170092e..5be9cc8 100644 --- a/plotter-app/test_gcode.gcode +++ b/plotter-app/test_gcode.gcode @@ -1,3 +1,4 @@ +<<<<<<< HEAD G21 ;Unit to mm G90 ;Absolute positioning @@ -407,3 +408,5 @@ G1 X131.07142857142858 Y7.5 Z0 G0 Z5 G0 X0.0 Y0.0 Z5 M5 +======= +>>>>>>> 783bf5bba9b28d0143a951285a2280d6fd0f3eeb