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

7710 Commits

Author SHA1 Message Date
Jaime van Kessel
696f904f3e isGlobalStack valid no longer remains false after it has been invalid once 2016-06-24 15:59:31 +02:00
Jaime van Kessel
727c34b535 HasUser settings now returns False when no container stack is found 2016-06-24 15:45:11 +02:00
fieldOfView
55af0af755 Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	resources/qml/Cura.qml
 2016-06-24 14:55:12 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
Jaime van Kessel
d0aa33f57f Added jobName property 
CURA-1036
 2016-06-23 17:05:45 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change 
CURA-1385
 2016-06-23 16:38:04 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	cura/CuraApplication.py
 2016-06-23 15:53:53 +02:00
Arjen Hiemstra
f6866d703d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing 
* 'master' of github.com:ultimaker/Cura: (110 commits)
  Rearrange MachineActions on Machines page
  Skip containers that can not be serialized
  Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup
  Use the right property for the property provider
  Clean up indentation
  Remove unused code
  Fix expanded settings for Per Object settings tool
  Use the expanded categories from Cura to expand the proper categories on startup
  Starting UMOCheckup before connection was established now works correctly
  Fixed layout
  Added missing decorator CURA-1385
  Restored accidental delete
  Removed extraneous space
  Refactoring; Renaming firstRunWizard to machineActionsWizard
  Added BedLevel as supported action to UMO
  Refactoring (Renaming variables so they are more clear & update documentation)
  Remove some trailing spaces CURA-1615
  GCodeProfileReader: Removing useless containername
  Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion
  Fix minor codereview issues
  ...
 2016-06-23 14:37:00 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
35a8e7ca94 Added missing decorator 
CURA-1385
 2016-06-23 11:41:13 +02:00
Jaime van Kessel
d499d59d97 Restored accidental delete 2016-06-23 11:19:54 +02:00
Jaime van Kessel
45dca3f878 Refactoring (Renaming variables so they are more clear & update documentation) 2016-06-23 11:09:55 +02:00
Arjen Hiemstra
3cc31fd9c2 When saving containers, use the mime type's preferred suffix instead of a hardcoded value 
Contributes to CURA-342
 2016-06-22 17:39:50 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
1e40d98fd7 Merge pull request #817 from Ultimaker/feature_multi_materialsnozzles 
Multiextrusion support for materials and nozzles
 2016-06-22 17:05:17 +02:00
Simon Edwards
65a8cf1c45 'One at a time' printing was broken due to a regression in the convex hull decorator. 
Contributes to CURA-1504
 2016-06-22 16:51:56 +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
Simon Edwards
631ef8e678 Reimplement the "no convex hull when using a tool" functionality. 
Contributes to CURA-1504
 2016-06-22 15:06:03 +02:00
Simon Edwards
9641a25f31 Fixed up the convex hull 'shadow' creation and deletion after the merge. 
Contributes to CURA-1504
 2016-06-22 14:48:15 +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
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
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
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
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
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
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
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +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
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +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
Jaime van Kessel
6f7affa2bf Machine actions can now be triggered from QML 
CURA-1385
 2016-06-17 17:22:49 +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
640e1a2350 Implemented interface for setting printjobstate 
CURA-1038
 2016-06-16 15:35:11 +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
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