Lipu Fei
e92c21af28
Remove FIXME
...
CURA-3495
2017-03-29 12:53:19 +02:00
Lipu Fei
42b8f06e99
Ignore gcode when selected multiple files
...
CURA-3495
2017-03-29 12:52:56 +02:00
Jack Ha
0655771cb8
Removed comment. CURA-3390
2017-03-29 11:00:59 +02:00
Jack Ha
d5d265a996
Resolve mc cherry-picking CURA-3390
2017-03-29 11:00:54 +02:00
Jack Ha
02bb575ced
Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390
2017-03-29 10:56:36 +02:00
Jack Ha
1e75c84662
Less yields for G-code reader and faster. CURA-3390
2017-03-29 10:56:28 +02:00
Jack Ha
ea0c55fff1
Solved merge conflict in cherry-pick CURA-3390
2017-03-29 10:56:26 +02:00
Jack Ha
fb2c318a0a
Added caution message for g-code reader. CURA-3390
2017-03-29 10:53:25 +02:00
Jaime van Kessel
fbc372812c
Minor refactor to improve readability
...
CURA-3390
2017-03-29 10:51:56 +02:00
jack
3a255b341f
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:43:41 +02:00
jack
f50c3f430a
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:37:13 +02:00
Ghostkeeper
f62488fd11
Catch JSONDecodeErrors on decoding messages from the network
...
The network can corrupt packages or the printer can only send partial messages. Cura shouldn't break on that. It's just a warning. This warning says more than the original stack trace does, because the stack trace only said like 'unexpected comma there and there' while this message actually says what message contained the error.
2017-03-29 10:34:27 +02:00
Jack Ha
099752125b
Arrange all now places biggest objects first. CURA-3239
2017-03-29 10:00:21 +02:00
Jack Ha
f357dea086
Tuned arranger a bit, good enough for proof of concept. CURA-3239
2017-03-29 09:32:29 +02:00
Ghostkeeper
6bf3d084b9
Update translation templates
...
These are generated from the state of the code at commit b67b41653f
2017-03-29 09:31:01 +02:00
fieldOfView
ba06f06cd0
Optimize code
2017-03-28 20:17:51 +02:00
Filip Goc
5cf2f9b021
add jellybox variants
...
there’s a one fan variant and a two fan variant. for now, both are only
0.4mm nozzle.
2017-03-28 12:58:22 -04:00
Filip Goc
a328261456
add jellybox specific profiles
...
pla and a few petg profiles to get started
2017-03-28 12:57:43 -04:00
Filip Goc
b0627159fa
rename jellybox platform mesh
...
jellybox_platform -> imade3d_jellybox_platform
2017-03-28 12:57:03 -04:00
Filip Goc
0d4a74182b
update and rename jellybox definition
...
- jellybox -> imade3d jellybox
- includes variants
2017-03-28 12:56:19 -04:00
Arjen Hiemstra
d7984c888b
Use a proper container mock for test user/quality changes
2017-03-28 18:20:13 +02:00
Arjen Hiemstra
30fd1ded45
Fix setPropertyOtherContainers test
...
Now uses writable stack and makes sure to compare the right values
2017-03-28 18:19:30 +02:00
Arjen Hiemstra
3c1cbd5aa9
Do not compare string to actual type
...
As far as we know, Global or Container stack should not take care of
string -> value conversion
2017-03-28 18:18:29 +02:00
Arjen Hiemstra
3620ce4c0a
Fix setPropertyUser test with the right container and parameter order of setProperty
2017-03-28 18:17:12 +02:00
Arjen Hiemstra
87ce6246d8
Introduce a "writable global stack" fixture
...
This one has MockContainers set for all containers that allow calling
setProperty
2017-03-28 18:16:00 +02:00
Arjen Hiemstra
317576e983
Set container entry to empty if it was not found in the original container
2017-03-28 18:14:16 +02:00
Arjen Hiemstra
dc84141714
Implement set/getProperty for MockContainer
...
Otherwise setProperty/getProperty tests will never work
2017-03-28 17:51:46 +02:00
Arjen Hiemstra
7175ac0d20
Do not try to perform a setProperty on a definition
...
That is never going to work
2017-03-28 17:50:37 +02:00
Arjen Hiemstra
2a2df31c5b
Set the User container to a writable container in testSetProperty
...
Since empty container (the default) will not allow writes
2017-03-28 17:50:09 +02:00
Arjen Hiemstra
3f1f4a172d
Fix constrainContainerTypes test
...
We do not allow random containers to be assigned to specific properties,
only the containers that specify they are of a certain type.
2017-03-28 17:48:55 +02:00
Arjen Hiemstra
593c6c0c8f
Set and clear ContainerStack's _containerRegistry property
2017-03-28 17:47:10 +02:00
Arjen Hiemstra
75931192f6
Allow setting Definition and setting Definition by ID
...
To match the other properties
2017-03-28 17:46:28 +02:00
Arjen Hiemstra
123c8bae45
Allow setting userChanges container
...
Since that makes it possible to create an external factory method for
creating stacks and makes the properties more consistent.
2017-03-28 17:46:00 +02:00
Arjen Hiemstra
2f6936c961
Fix type checking in GlobalStack
2017-03-28 17:45:15 +02:00
Arjen Hiemstra
4cea1b6d33
Fix error case in addExtruder
...
Error out when the new size is going to be more than extruderCount
instead of whether it currently is more than extruderCount.
2017-03-28 17:44:29 +02:00
Arjen Hiemstra
4005f5082b
Allow setting of properties on GlobalStack
2017-03-28 17:43:11 +02:00
Lipu Fei
208935960f
Add comments for putting open file logic in qml
...
CURA-3495
2017-03-28 15:02:50 +02:00
Lipu Fei
e4af8e36bb
Fix dialog text for opening multiple files with project(s)
...
CURA-3495
2017-03-28 14:38:26 +02:00
Lipu Fei
1fc7120fff
Fix dialog text "file(s)" -> "files"
...
CURA-3495
2017-03-28 14:27:40 +02:00
Lipu Fei
5bec46a29c
Drag-and-drop files behave the same as open file menu
...
CURA-3495
2017-03-28 14:27:40 +02:00
Jack Ha
bf08d30e7d
Added first arrange function and smart placement after loading. CURA-3239
2017-03-28 14:27:22 +02:00
Jaime van Kessel
38a07d75c7
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-28 13:16:00 +02:00
Jaime van Kessel
db1fb8e692
Moved authentication request state change
2017-03-28 13:14:47 +02:00
Tim Kuipers
7a67ab4e66
Merge branch '2.5'
2017-03-28 12:55:18 +02:00
Tim Kuipers
db2766aba1
fix: move prime positions to the sides (CURA-3605)
2017-03-28 12:53:46 +02:00
Jaime van Kessel
910ff7acea
No longer check printer state when no material lengths are known
...
This fixes issues with g-code from g-code reader not having material lengths set.
CURA-3604
2017-03-28 11:59:07 +02:00
Jack Ha
d8c20b9d6c
First version of multiply object seems to work quite well. CURA-3239
2017-03-28 11:33:07 +02:00
Jaime van Kessel
6367755875
Disabled center_on_select for windows, as pyqt has a bug with it
2017-03-28 10:21:52 +02:00
Arjen Hiemstra
8f36e76588
Make sure to use the right metadata type entry for mock containers
2017-03-27 17:57:07 +02:00
Arjen Hiemstra
60ee1a3f75
We also raise InvalidContainer when setting variant
2017-03-27 17:56:46 +02:00
