GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 19:09:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,663 Commits 295 Branches 268 Tags
Commit Graph

8663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
6bf3d084b9
Update translation templates 
These are generated from the state of the code at commit b67b41653fc7c24061103993016fb29b86a51488.

Contributes to issue CURA-3487.
 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
Arjen Hiemstra
5892f13349 Fix naming of definitionChanges property in test 2017-03-27 17:55:44 +02:00
Arjen Hiemstra
da751fa0ea We raise InvalidContainerError, not KeyError when a container was not found 2017-03-27 17:55:24 +02:00
Arjen Hiemstra
270cdd08cb Don't modify ContainerStack._containerRegistry property 
We do not use it in GlobalStack
 2017-03-27 17:54:44 +02:00
Arjen Hiemstra
385d8ac5b5 Properly mock Container and ContainerRegistry objects in Global stack test 2017-03-27 17:53:30 +02:00
Arjen Hiemstra
b6fafb06ed Ensure we initialize the list of containers for GlobalStack 2017-03-27 17:52:38 +02:00
Arjen Hiemstra
39803cf7dd Add missing imports to Extruder/GlobalStack 2017-03-27 17:52:16 +02:00
Ghostkeeper
2810054f8e
Fix spelling of maximum skin angle expansion description 2017-03-27 16:00:09 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
 2017-03-27 16:00:08 +02:00
Jack Ha
efa1513e4c
Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 16:00:08 +02:00
Ghostkeeper
b67b41653f
Fix spelling of maximum skin angle expansion description 2017-03-27 15:59:27 +02:00
Jaime van Kessel
88704051d1 Filter bar is now always visible 
CURA-3574
 2017-03-27 15:47:30 +02:00
Lipu Fei
6644a4d386 Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
 2017-03-27 11:09:40 +02:00
Jack Ha
088202c366 Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 10:30:51 +02:00
Arjen Hiemstra
5196ea695c Add a notify signal to all container properties in GlobalStack 
Contributes to CURA-3497
 2017-03-27 01:35:34 +02:00