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

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kuipers
b22d65c369 Merge branch 'master' into feature_zhop_over_other_material 2016-06-22 13:25:50 +02:00
Jaime van Kessel
dcafb7d83a Removed Execute, as it's no longer used 
CURA-1385
 2016-06-22 13:10:10 +02:00
Jaime van Kessel
e1828a7689 Removed stray debug print 
CURA-1385
 2016-06-22 12:59:35 +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
b17d621243 Disable nozzle/material selection on the global tab 
The global tab has no nozzle/material by definition.
CURA-333
 2016-06-22 09:55:25 +02:00
fieldOfView
6fa1fb9d2f Select "Global" tab when switching to a machine that has multiple extruders. 
CURA-333
 2016-06-22 09:55:24 +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
fieldOfView
5d8a9a2cda Keep the same material and quality when switching nozzle or material 
CURA-333
 2016-06-22 09:55:22 +02:00
fieldOfView
92905ada34 Show true extrudernames in Simple Mode support extruder selection combobox 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
eba2451cf2 Add tooltip to extruder-tabs 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
68ee4f0ea1 Format extrudername to include material name 
CURA-333
 2016-06-22 09:55:20 +02:00
fieldOfView
f083d41353 Update extrudermodel when material is changed 
So the swatch updates, and we can use the materialname for extruder selection later on

CURA-333
 2016-06-22 09:55:20 +02:00
fieldOfView
d0626f8c8a Add hypothetical multiextrusion printer to test 2016-06-22 09:55:19 +02:00
fieldOfView
825fcc2020 Fix filtering of variants and materials by definition instead of by machine 
CURA-333
 2016-06-22 09:55:18 +02:00
fieldOfView
ee7cfe273e 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-22 09:55:18 +02:00
fieldOfView
bd703e65af Fix variant vs nozzle 
CURA-333
 2016-06-22 09:55:17 +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
671a6105a2 Setting a action to finished also causes it to be reset 
CURA-1385
 2016-06-21 16:22:54 +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
Ghostkeeper
63edd6f74d
Improve default raft settings 
Results from materials testing.
 2016-06-21 12:57:33 +02:00
Jaime van Kessel
81602e9ccd Machine action can now create displayItems 
CURA-1385
 2016-06-21 12:47:34 +02:00
Jaime van Kessel
3342f2a76a Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-20 13:52:11 +02:00
Jaime van Kessel
8af2b076a7 Added plugin for UM machine actions 
CURA-1385
 2016-06-20 13:51:27 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings 
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
 2016-06-20 12:00:56 +02:00
Jaime van Kessel
83c1ee8082 Required/supported/first run actions are now added to the manager 
CURA-1385
 2016-06-20 10:52:18 +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
Tim Kuipers
0f92f78916 JSON fix: z hop inheritance functions and default value (CURA-1506) 2016-06-17 17:26:23 +02:00
Jaime van Kessel
6f7affa2bf Machine actions can now be triggered from QML 
CURA-1385
 2016-06-17 17:22:49 +02:00
Tim Kuipers
611c88c630 JSON fix: lil indent (CURA-1506) 2016-06-17 16:52:04 +02:00
Tim Kuipers
94dcacb27e JSON feat: Z Hop only over printed parts and Z Hop Enable (CURA-1506) 2016-06-17 16:51:37 +02:00
Tim Kuipers
db3d568c76 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-17 16:31:22 +02:00
Jaime van Kessel
af3e4e3a15 Machine actions can now be used as a plugin type for Cura 
CURA-1385
 2016-06-17 15:45:10 +02:00
Jaime van Kessel
4beec2982e Fixed typo 
CURA-1385
 2016-06-17 15:23:15 +02:00
Jaime van Kessel
78a0c623ef Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-17 14:59:16 +02:00
Jaime van Kessel
96e6477793 Print monitoring tab now has icons indicated if it's paused / connected 
CURA-1036
 2016-06-17 13:06:33 +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
Jaime van Kessel
1232ac7df5 Temperatures are now rounded + displayed with celcius sign 
CURA-1036
 2016-06-17 12:05:23 +02:00