GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,709 Commits 288 Branches 260 Tags
Commit Graph

882 Commits

Author SHA1 Message Date
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
cbbb204718 Merge branch 'master' of github.com:Ultimaker/Cura into feature_multi_materialsnozzles 2016-06-22 16:32:37 +02:00
Jaime van Kessel
23ca2a3f54 Fixed layout issues 
CURA-1385
 2016-06-22 15:37:22 +02:00
Jaime van Kessel
1912722d31 Fixed requesting size of machine for bedLeveling 
CURA-1385
 2016-06-22 15:35:23 +02:00
Jaime van Kessel
4e854700f1 Machine_action plugin objects are now added as list 
CURA-1385
 2016-06-22 15:24:37 +02:00
Simon Edwards
6548930d46 Merge branch 'master' into simple_convex_hull 2016-06-22 15:09:53 +02:00
Jaime van Kessel
5aab4686ca Layout fixes 
CURA-1385
 2016-06-22 14:50:05 +02:00
Jaime van Kessel
c297b14e03 Added UMO checkup action 
CURA-1385
 2016-06-22 14:40:58 +02:00
Thomas Karl Pietrowski
3ea11d3063 SliceInfo: Removing debug code 2016-06-22 14:35:19 +02:00
Thomas Karl Pietrowski
4bc5883ad7 SliceInfo: Check for available data before submitting it 
The code here is self-explaining again..
 2016-06-22 14:30:20 +02:00
Thomas Karl Pietrowski
f1ac2405a7 Merge branch 'master-CURA-1615' of https://github.com/thopiekar/Cura.git into master-CURA-1445 2016-06-22 14:02:41 +02:00
Thomas Karl Pietrowski
1dc29fb984 SliceInfo: Correctly output the print time 2016-06-22 14:02:11 +02:00
Thomas Karl Pietrowski
e78bd92b7f SliceInfo: Adding all containers as serialized data 2016-06-22 14:01:23 +02:00
Jaime van Kessel
4ad7731efd Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-22 12:45:29 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled 
CURA-1385
 2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency" 
This reverts commit 963a2092efefb62f8f8b1216f0a7d05bbebb884d.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
 2016-06-22 10:19:44 +02:00
fieldOfView
3fcfbb4e48 Fix extruder color when no extruder_nr has been added to an object 
CURA-345
 2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency 
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
 2016-06-22 09:55:23 +02:00
fieldOfView
f5bdc0295c Use color specified by material or nozzle to render objects 
CURA-345
 2016-06-22 09:55:23 +02:00
Jaime van Kessel
6f6d70ad0f Added upgradeFirmware as machineAction 
CURA-1385
 2016-06-21 17:00:26 +02:00
fieldOfView
8a206b74fd Use new-style signalemitter decorator instead of SingalEmitter subclass 
CURA-1615
 2016-06-21 16:24:07 +02:00
Jaime van Kessel
fb1313ceda BedLevel action now resets once it did all the steps 
CURA-1385
 2016-06-21 16:23:31 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed 
CURA-1385
 2016-06-21 16:19:44 +02:00
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull 
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
 2016-06-21 14:47:10 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible 
CURA-1385
 2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +02:00
Jaime van Kessel
8af2b076a7 Added plugin for UM machine actions 
CURA-1385
 2016-06-20 13:51:27 +02:00
Thomas Karl Pietrowski
eb6abdf773 Move f.close() into try: 
In case urlopen() fails, e.g. because of a missing internet connection,
f will be indefined.
 2016-06-18 14:07:14 +02:00
Thomas Karl Pietrowski
8f450d0d2f Sending serialized global_settings 
Containers currently don't have a function to return their content as
JSON or dict
 2016-06-18 14:05:32 +02:00
Thomas Karl Pietrowski
cbb8eebf72 Correcting and adding different things to SliceInfo 
* Replace regular print() with Logger.logException()
* Adding log message that reporting is turned off
* Rename variable "settings" to "global_container_stack". Should be less
misleading.
 2016-06-17 12:52:14 +02:00
Thomas Karl Pietrowski
4ca247cf37 Changing the profile name to something unique. 
Imported profiles will be now called "Custom profile (<G-code
filename>)"
 2016-06-17 12:41:24 +02:00
Thomas Karl Pietrowski
9511692638 Replace old MachineManager with GlobalContainerStack 
Also removing unused variable.
 2016-06-17 12:10:34 +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
Thomas Karl Pietrowski
200529e8c9 Removing setReadOnly(False) 
The profile is writable by default.
 2016-06-17 11:43:23 +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
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
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
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
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
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
Thomas Karl Pietrowski
a7fc3258a7 Only use Application.[...].getGlobalContainerStack() to get all values 2016-06-15 11:16:13 +02:00
Thomas Karl Pietrowski
5128ea41c4 Getting "machine_heated_bed" (hopefully) correctly + little fix 2016-06-15 10:57:58 +02:00
Thomas Karl Pietrowski
9e6f5a4a68 CURA-1615 - Updating for API 3 
This updates the firmware updater to use the new MachineManagerModel

Additionally renamed "machine_type" to "machine_id", which makes it more
selfexplaining, when reading the code.

My printers firmware is not available here and has no heated bed, so
please test this commit!
 2016-06-15 10:04:47 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
 2016-06-13 18:23:53 +02:00