GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 295 Branches 268 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
1f9acf0b54 Color of progress bar now changes based on jobstate 
CURA-1036
 2016-06-17 12:01:48 +02:00
Thomas Karl Pietrowski
0275139a50 Merge branch 'master' of https://github.com/Ultimaker/Cura into master-CURA-1615 2016-06-17 11:59:08 +02:00
Jaime van Kessel
ef9ce7ad55 Made time total & time remaining pretty 
CURA-1036
 2016-06-17 11:55:53 +02:00
Thomas Karl Pietrowski
200529e8c9 Removing setReadOnly(False) 
The profile is writable by default.
 2016-06-17 11:43:23 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
Thomas Karl Pietrowski
65f2afeebd Use the same id as set when exporting 
Nothing special. Doesn't fix anything..
 2016-06-17 11:36:39 +02:00
Jaime van Kessel
168246d594 Added progress percentage label 
CURA-1036
 2016-06-17 11:02:22 +02:00
Thomas Karl Pietrowski
29f7c240c4 CURA-1615: Updating SlicingInfoPlugin 
Just bumped the API version to 3 and added a message that is sent to the
log that data was sent to the given URL.
As slicing is broken here, because of "Arcus Error (5, native 32): Could
not send message size" this also needs testing here.
 2016-06-16 20:37:32 +02:00
Thomas Karl Pietrowski
42a860535c Updating API to 3 2016-06-16 20:19:03 +02:00
Thomas Karl Pietrowski
9e1b10d1b8 CURA-1615: Updating GCodeProfileReader 
I got the plugin most of all working. At least the "successfully"
imported profile XY" dialog appears. But sadly the profile does not
appear in the list of profiles after that. I can only guess something is
blocking here.
Additionally it should be noted that G-Code exported from Cura 2.1.x
does not work here anymore on Cura 2.2.x.
 2016-06-16 20:02:21 +02:00
Jaime van Kessel
ec34d92500 Resume, pause & abort are handled correctly 
CURA-1036
 2016-06-16 17:47:05 +02:00
Jaime van Kessel
74c4774092 Fixed print /resume button 
CURA-1036
 2016-06-16 17:21:16 +02:00
Jaime van Kessel
8d8b479216 Adding pause / resume buttons for print monitoring 
CURA-1036
 2016-06-16 15:36:51 +02:00
Jaime van Kessel
640e1a2350 Implemented interface for setting printjobstate 
CURA-1038
 2016-06-16 15:35:11 +02:00
fieldOfView
68a737129e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 15:09:07 +02:00
fieldOfView
0893e4b2cc Revert "Fix variant vs nozzle" 
This reverts commit cb05f75f6ab754f1f095e1cabd19f7259ed917bf.
 2016-06-16 15:08:45 +02:00
fieldOfView
666b1a0263 Revert "Fix check for has_variants & has_materials" 
This reverts commit 7f093be75a1a31f07eba79ec89ab08ebc2d9622d.
 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 623b8f276e8c74023aad1592fc16bf98d50da1d5.
 2016-06-16 15:08:05 +02:00
Ghostkeeper
60d6cc07fb
Add Mendel90 by Bo Herrmannsen 
Provided via https://github.com/Ultimaker/Cura/issues/808
 2016-06-16 13:17:41 +02:00
fieldOfView
f2819cb9b0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 12:47:23 +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
Ghostkeeper
e308c69c54 Merge pull request #804 from thopiekar/master-eclipse-markers 
Adding a marker for a correctly unresolved import on Linux and OSX
 2016-06-16 11:07:27 +02:00
Jaime van Kessel
a735e92dfa Added camera image overlay when monitoring print 
CURA-1036
 2016-06-16 11:01:58 +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
Aldo Hoeben
3d53bc38b7 Merge pull request #803 from thopiekar/master-CURA-1615 
[CURA-1615] Updating firmware manager for API 3
 2016-06-15 17:49:20 +02:00
Thomas Karl Pietrowski
7ef64cd05b Return an empty string just to be sure 2016-06-15 17:43:28 +02:00
Thomas Karl Pietrowski
6b41608db2 Correcting the last comment.. 2016-06-15 17:33:52 +02:00
Thomas Karl Pietrowski
51222325b0 Last cleanup 
Removing useless comments and replacing the log message with something
more simple.
 2016-06-15 17:29:49 +02:00
Jaime van Kessel
8160f8d5e6 Added more data to the print monitor screen 
CURA-1068
 2016-06-15 16:47:19 +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
Jaime van Kessel
8a603c2fc1 Added basic tabs for monitoring print 
CURA-1036
 2016-06-15 16:17:52 +02:00
Thomas Karl Pietrowski
38eec41162 Merge pull request #805 from thopiekar/master-using-platform 
Differencing between Platform from UM.* and UM.Scene.*
 2016-06-15 16:04:32 +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
77961e83c2 Adding a marker for a correctly unresolved import on Linux and OSX 2016-06-15 15:05:36 +02:00
Thomas Karl Pietrowski
3c4d09464d Merge pull request #790 from thopiekar/master-using-platform 
[master] Using UM.Platform for OS detection
 2016-06-15 15:00:21 +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
Thomas Karl Pietrowski
2e7db9b732 Adding check whether getGlobalContainerStack() returns None or not. 
If we get None here, the firmware-updater will be closed and detailed
error returned to the logs with an explanation why.
 2016-06-15 14:38:23 +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
8b5800c1ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-15 14:14:19 +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
Ghostkeeper
8617f10a46 Merge branch 'materials_test' 2016-06-15 13:58:18 +02:00
Ghostkeeper
85422ae6a5
Make extruder_nr a string value 
It's an enum after all, and the front-end doesn't work well with enums that are ints. The code for the back-end should remain the same.

Contributes to issue CURA-1716.
 2016-06-15 13:52:57 +02:00