3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19
3457 commits 330 branches 295 tags 714 MiB
Commit graph

717 commits

Author SHA1 Message Date
fieldOfView
0893e4b2cc Revert "Fix variant vs nozzle" 
This reverts commit cb05f75f6a.
 2016-06-16 15:08:45 +02:00
fieldOfView
666b1a0263 Revert "Fix check for has_variants & has_materials" 
This reverts commit 7f093be75a.
 2016-06-16 15:08:20 +02:00
fieldOfView
a5424fa207 Revert "Fix filtering of variants and materials by definition instead of by machine" 
This reverts commit 623b8f276e.
 2016-06-16 15:08:05 +02:00
fieldOfView
623b8f276e Fix filtering of variants and materials by definition instead of by machine 
CURA-333
 2016-06-16 12:47:08 +02:00
Jaime van Kessel
2d78f0a610 Added job_state property 
CURA-1036
 2016-06-16 11:43:25 +02:00
fieldOfView
7f093be75a Fix check for has_variants & has_materials 
These are defined as bool values instead of strings in UM2+ definitions, so I would expect other machine definitions (including jedi) also use bools.

CURA-333
 2016-06-16 10:41:50 +02:00
fieldOfView
631ab9c0a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 10:14:49 +02:00
fieldOfView
cb05f75f6a Fix variant vs nozzle 
CURA-333
 2016-06-16 10:14:17 +02:00
Jaime van Kessel
3a46bb8d8a Added CameraImageProvider & camera handling 
CURA-1036 and CURA-338
 2016-06-16 09:34:43 +02:00
Simon Edwards
98f9b4f9a0 Minor codestyle/naming fix. 
Contributes to CURA-1667 Profile import/export
 2016-06-16 09:15:34 +02:00
Jaime van Kessel
c130d4d9cf Added properties for total time and time spend on print 
CURA-1036
 2016-06-15 16:46:03 +02:00
Simon Edwards
d74cecd9db Set the ID of the profile object during import; ensure it is unique. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 16:27:40 +02:00
Simon Edwards
4cc0026af3 Minor rework in response to code review. 
Contributes to CURA-1504
 2016-06-15 16:22:48 +02:00
Thomas Karl Pietrowski
6a89062b0a Differencing between Platform from UM.* and UM.Scene.* 2016-06-15 16:03:18 +02:00
Thomas Karl Pietrowski
536e0f489a Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform 2016-06-15 14:59:34 +02:00
Ghostkeeper
7c2c24b8a5
Remove unused function 
Contributes to issue CURA-340.
 2016-06-15 14:38:19 +02:00
Ghostkeeper
cb467f488b
Don't convert ids to lowercase 
Eventually we might have to do this due to case-insensitivity of some file systems, but this is not the place for that anyway.

Contributes to issue CURA-340.
 2016-06-15 14:36:58 +02:00
Jaime van Kessel
12faf23af8 Added a way to check if a printer is connected 
CURA-1036
 2016-06-15 14:13:54 +02:00
Simon Edwards
92569d63e9 Call the method correctly through the instance. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 13:40:41 +02:00
Simon Edwards
70b2311c59 Use the file name to create the profile name during import. Also moved the createUniqueName() method up into CuraContainerRegistry. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 12:51:47 +02:00
fieldOfView
89f64eb870 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-15 11:13:48 +02:00
fieldOfView
2460b37c99 Fix check for self._global_container_stack for consistency 
CURA-340
 2016-06-15 11:13:31 +02:00
Jaime van Kessel
7176c98d8a Fixed stupid mistake with getting active extruder stack 
CURA-1689
 2016-06-15 10:21:06 +02:00
Jaime van Kessel
f0340c6d63 Rework based on review 
CURA-1689
 2016-06-15 09:50:05 +02:00
Simon Edwards
004a000d51 Corrected the i18n catalog used. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 21:04:51 +02:00
Jaime van Kessel
eb836bfc3f Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-14 11:52:04 +02:00
Jaime van Kessel
3777acd4cd Changed order of inheritance. 
Because the python new is stupid, it fails to notice the qObject if it's not defined first
 2016-06-14 11:50:59 +02:00
Simon Edwards
175b5429b4 Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 11:44:38 +02:00
fieldOfView
c0b31d85fa Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-14 11:06:18 +02:00
fieldOfView
7faae685e5 Use different default colors for each extruder 
CURA-340
 2016-06-14 10:58:26 +02:00
Jaime van Kessel
18a1239443 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-14 09:43:12 +02:00
Jaime van Kessel
b429f98d6a Added signalemitter decoration 
CURA-49
 2016-06-14 09:42:05 +02:00
fieldOfView
a545cde4a8 Force setting fields to update when discarding changes 
Textfields that have the focus don't (always) update when a new value is set.
CURA-1585
 2016-06-13 11:53:57 +02:00
Ghostkeeper
d4f59b0086 Merge pull request #792 from thopiekar/master-code-cleanup 
[master] code cleanup
 2016-06-13 00:41:54 +02:00
fieldOfView
534a4adc8e Fix showing/hiding variant/material dropdowns when switching between machines 
CURA-340
 2016-06-12 20:55:25 +02:00
Thomas Karl Pietrowski
bf1cb8ae52 Rename 'attribute' to 'property_name' 2016-06-12 15:49:13 +02:00
fieldOfView
17d1dbd804 Fix updating the sidebar when a setting is changed in an extruder 
CURA-1585
 2016-06-12 14:26:12 +02:00
fieldOfView
168415554d Typo and codestyle 2016-06-12 13:56:37 +02:00
fieldOfView
293d7c06d9 Revert "Use callLater to set the active machine in MachineManager" 
This reverts commit 0aea7bdb5c.
Advanced mode showed no settings, and things were generally not working after this commit, so I am reverting the change for now.
 2016-06-12 13:55:47 +02:00
Thomas Karl Pietrowski
c1cf78f662 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' into master-using-platform 2016-06-12 10:53:36 +02:00
Thomas Karl Pietrowski
a9671cdcfd Deleting a backup 
This removes a backup, which I made when switching between git branches.
 2016-06-11 23:00:44 +02:00
Ghostkeeper
e813c2c08e Merge pull request #787 from Ultimaker/exception_handling_fixes 
Minor Exception handling Fixes
 2016-06-11 15:23:16 +02:00
Thomas Karl Pietrowski
b047db36fd Using isLinux() for Linux detection 
Of course there are more places where we can replace these checks.
 2016-06-11 13:43:50 +02:00
Thomas Karl Pietrowski
c38e31f0e3 BuildVolume: Remove worthless line 
Just a small clean up. skirt_size was initialized twice.
 2016-06-11 13:21:52 +02:00
Thomas Karl Pietrowski
41d03536eb Using a save name for variable "property" 
Using "property" here might be not save. Just replaced that variable
with "attribute" and added a reminder, so nobody renames it to
"property" again.
 2016-06-11 13:16:40 +02:00
Thomas Karl Pietrowski
0d8292df49 Using platform.system() for Windows detection 
This is just cosmetics. It works the same as system.platform, but looks
better. Additionally "win32" might be misleading, as it sounds like we
are checking for Windows 32bit here.
 2016-06-11 12:50:28 +02:00
Jaime van Kessel
cc17c28978 Fixed global stack not being set as next stack for extruder trains 2016-06-10 17:26:09 +02:00
Jaime van Kessel
8c43d4c4cb Quality is now set for extruder, regardless if the machine has machine specific qualities 2016-06-10 17:04:25 +02:00
Jaime van Kessel
fa72630c0a Merge branch 'multiextruder_profiles' of github.com:Ultimaker/Cura into multiextruder_profiles 2016-06-10 16:54:24 +02:00
Jaime van Kessel
9626cddf34 Extruder trains are now correctly saved 2016-06-10 16:53:59 +02:00