clemniem
|
fffc0c4ecb
|
excluded text from being jumped over, because it is not on the paper
|
2016-06-23 11:04:22 +02:00 |
|
clemniem
|
aad5efff2d
|
WIP show text after upload in svg.
missing:
- add warning/dialogue about text in conversion dialogue
- cleanup
|
2016-06-21 15:13:36 +02:00 |
|
clemniem
|
6641390620
|
resolved #69
rectangles are now removed after pressing clear button
|
2016-06-20 11:26:08 +02:00 |
|
make-ing
|
12a3f092e2
|
fixed problem when svg elements contain mm units, by converting them to pixel with a fixed dpi of 90.
|
2016-06-17 14:18:44 +02:00 |
|
make-ing
|
25be52587e
|
fixed problem when xml tag in svg file is missing.
|
2016-06-17 12:02:56 +02:00 |
|
make-ing
|
3bbdd702db
|
added functionality to remove comments ahead of time to remove the progress bar bug on gcode files with embeded (base64) images.
|
2016-06-15 11:30:53 +02:00 |
|
make-ing
|
0c5804e51a
|
added functionality to remove all clipPath elements from svg into the placeSVG function
|
2016-06-02 18:12:50 +02:00 |
|
make-ing
|
36837246fe
|
Merge branch 'mrbeam' into mrbeam-dev
|
2016-06-02 15:28:11 +02:00 |
|
make-ing
|
2c416eafc2
|
added functionality to unlock the GUI when grbl is also unlocked with "$x" command
|
2016-06-02 14:43:20 +02:00 |
|
make-ing
|
3128ac7765
|
bux fixing issue #67: Chrome now treats the event target attributes like Firefox, so no need for distinction anymore.
|
2016-05-27 18:17:39 +02:00 |
|
clemniem
|
6ffcaabbeb
|
bugfix #64 renamed update notification to mention mrbeam
|
2016-05-25 16:04:39 +02:00 |
|
make-ing
|
48f5b659e1
|
changed back last commit
|
2016-05-04 16:35:55 +02:00 |
|
make-ing
|
9e95f49461
|
changed to new grbl.hex file
|
2016-05-04 16:23:43 +02:00 |
|
make-ing
|
64763e8ce1
|
added version check again... was missing since the change to comm_acc2.py
|
2016-05-02 09:57:58 +02:00 |
|
make-ing
|
e7fcb5b228
|
Merge branch 'nativeserial' into mrbeam
|
2016-04-18 17:16:28 +02:00 |
|
make-ing
|
020073f3ae
|
Merge branch 'mrbeam' into stable-1.2.2
|
2016-04-18 14:44:52 +02:00 |
|
make-ing
|
c0e4f123ff
|
Firefox bug fixes
|
2016-04-18 11:35:28 +02:00 |
|
make-ing
|
94c673473b
|
Merge branch 'mrbeam' into stable-1.2.2
|
2016-04-15 16:00:28 +02:00 |
|
make-ing
|
974094b907
|
changed "toElement" to "target" for better cross browser compatibility
|
2016-04-15 15:53:48 +02:00 |
|
make-ing
|
dc23dac20c
|
fix for the chrome 50 changes where they removed the SVGElement.offset* attributes.
|
2016-04-15 15:42:04 +02:00 |
|
make-ing
|
ba2716f968
|
added the Raspberry Pi native serial port ttyAMA* to serialList function
|
2016-04-13 12:09:39 +02:00 |
|
make-ing
|
a0e685ef1c
|
fixed reset of finished passes bug.
|
2016-03-21 12:45:50 +01:00 |
|
make-ing
|
cfacbe2610
|
Merge branch 'stable-1.2.2' into mrbeam-multipass
Conflicts:
src/octoprint/static/js/app/viewmodels/printerstate.js
src/octoprint/util/comm_acc2.py
|
2016-03-18 13:38:05 +01:00 |
|
make-ing
|
4da0c3dbe0
|
added number of passes reset on print start
|
2016-03-18 13:33:57 +01:00 |
|
make-ing
|
a1d9d2ea7b
|
moved reset override slider functionality to separate method.
(cherry picked from commit e5c600e)
|
2016-03-18 13:28:40 +01:00 |
|
make-ing
|
3201053e16
|
added multi passes support in backend
|
2016-03-18 12:24:41 +01:00 |
|
make-ing
|
e5c600e972
|
moved reset override slider functionality to separate method.
|
2016-03-17 09:59:49 +01:00 |
|
make-ing
|
d7b5fae614
|
fixed wrong feedrate and intensity slider bug. On every new print start the sliders are set back to 100%.
|
2016-03-16 14:16:15 +01:00 |
|
make-ing
|
bf4c9c2105
|
fixed bug within placeIMG where the picture was to high to fit into the workspace area.
|
2016-03-15 17:11:54 +01:00 |
|
make-ing
|
3db371fbb0
|
added feedrate and intesity reset at beginning of each laser job.
|
2016-03-14 15:15:13 +01:00 |
|
make-ing
|
9c822b7e93
|
added multipass placeholder functions
|
2016-03-02 15:48:52 +01:00 |
|
make-ing
|
064cd33455
|
merged with mrbeam branch
|
2016-02-22 12:11:34 +01:00 |
|
make-ing
|
e54364a45c
|
parenthesis bug fixed
|
2016-02-22 10:54:29 +01:00 |
|
make-ing
|
327ac869ce
|
added support for embedded images in svg via "href" and "xlink:href"
|
2016-02-22 10:37:20 +01:00 |
|
make-ing
|
60fb13faa2
|
fixed bug with embedded images in svg's
|
2016-02-17 16:17:45 +01:00 |
|
make-ing
|
94effaeda7
|
fixed wrong positioning if only x2 value was to out of bounds maybe also need to be tested for y direction
|
2016-02-16 13:54:39 +01:00 |
|
make-ing
|
17f29984e5
|
fixed image bug with missing {}
|
2016-02-16 12:53:20 +01:00 |
|
Teja
|
73749fbb19
|
added multipass ui
|
2016-01-29 18:11:59 +01:00 |
|
make-ing
|
8c218b21f8
|
changed conversion filename to fixed "temp.svg", so its doesn't use up all the space by creating a new file for every new conversion.
|
2016-01-29 15:31:54 +01:00 |
|
Teja
|
597481905b
|
bugfix. images in groups with transform attributes are transformed correct now.
|
2016-01-27 17:53:41 +01:00 |
|
make-ing
|
a5330313a4
|
Merge remote-tracking branch 'origin/mrbeam' into mrbeam
Conflicts:
src/octoprint/util/comm_acc2.py
|
2016-01-15 16:43:22 +01:00 |
|
make-ing
|
de622e5e8e
|
slider bug fix
|
2016-01-15 16:41:35 +01:00 |
|
make-ing
|
bead551353
|
Testing slider bug fix: wrong variable used
|
2016-01-15 16:19:07 +01:00 |
|
make-ing
|
6867ab99a2
|
Testing slider bug fix: removed dictionary stuff
|
2016-01-15 15:11:21 +01:00 |
|
make-ing
|
aa7a781c92
|
Testing slider bug fix
|
2016-01-15 11:53:27 +01:00 |
|
Teja
|
9a9afa3be3
|
bugfix. added default coordinates for circle / ellipse elements as corel omits them sometimes.
|
2016-01-07 11:04:12 +01:00 |
|
Teja
|
a6dc870cb5
|
bugfix. CorelDraw rectangles with no 'x' and 'y' attributes set are treated correct now.
|
2016-01-06 11:54:06 +01:00 |
|
Teja
|
be5fd41f61
|
Merge branch 'mrbeam' into stable-1.2.2
|
2015-11-16 16:01:54 +01:00 |
|
Teja
|
5c8d491fb8
|
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
|
2015-11-16 15:47:40 +01:00 |
|
Teja
|
deda1d4bc7
|
code cleanup
|
2015-11-16 15:29:19 +01:00 |
|