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

4159 Commits

Author SHA1 Message Date
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker 
Docker support
 2018-03-07 11:08:42 -08:00
Diego Prado Gesto
e7294e1299 CURA-4870 Correctly look for the buildplate variants using the 
machine_buildplate_type that is also sent in the gcode and is the
information that Cura gets from connect.
Create a new dict in the VariantManager that maps the
machine_buildplate_type with the right container
 2018-03-07 18:52:48 +01:00
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading 
CURA-5056
 2018-03-07 16:38:24 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output 
model so it can be used to show the buildplate name in the configuration
list.
 2018-03-07 13:57:13 +01:00
Jack Ha
859ac88357 Merge branch 'master' into feature_enable_disable_extruder 2018-03-07 12:59:40 +01:00
Lipu Fei
c0d55ac2a8 Postpone signals in project loading to avoid incomplete data update 
CURA-5056
 2018-03-07 11:45:49 +01:00
Jack Ha
ff1c378c08 CURA-4400 fix start slicing when disabled extruder is incompatible 2018-03-07 11:38:35 +01:00
Aleksei S
23653d7357 Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page 
CURA-4960
 2018-03-07 11:34:10 +01:00
Ghostkeeper
507de9c22c
Catch timeout exceptions when printing via USB 
If the firmware froze or something...
 2018-03-07 11:30:36 +01:00
Ghostkeeper
ecfb62b69e
Rename ColorChange to FilamentChange 
I think this is more clear to the users what this should actually do.
 2018-03-07 11:01:00 +01:00
Lipu Fei
75d9297c7d Optimize 3MF writer and XML material serialization 
CURA-5049
 2018-03-06 17:05:58 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Jack Ha
095d9fbdf6 CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 17:01:30 +01:00
Ghostkeeper
3b0a9bf16c
Fix checking whether to render objects in X-ray pass 
Otherwise nothing gets drawn there.

Contributes to issue CURA-5040.
 2018-03-06 15:53:34 +01:00
Ghostkeeper
b179edf60e
Document which layer is which pass 
Contributes to issue CURA-5040.
 2018-03-06 15:53:34 +01:00
Aleksei S
6bb42da056 Removed related commits to Settins per Object validation and 
added short validation in StartScliceJob
CURA-4972
 2018-03-06 15:40:26 +01:00
Aleksei S
42ac725705 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-06 12:40:55 +01:00
Aleksei S
1f883f3312 Remove reply hanlder to prevent crash after canceling a printing job 
CURA-4960
 2018-03-06 12:39:54 +01:00
fieldOfView
0578e74e71 Merge branch 'master' into feature_xmlmaterials_cura_settings 
# Conflicts:
#	plugins/XmlMaterialProfile/XmlMaterialProfile.py
 2018-03-06 11:40:58 +01:00
ChrisTerBeke
96b40433a9 Merge branch 'master' into docker 2018-03-06 11:19:30 +01:00
Ian Paschal
8d5a643c9b Removed print() statement 2018-03-06 10:51:39 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Aleksei S
a35d4ae400 Fix: After clicking "cancel" button while sending a print job 
the connection is disconnected
CURA-4960
 2018-03-05 16:43:58 +01:00
ChrisTerBeke
cd01b096b5 Emit backend errors so we can process them differently than through a qml notification 2018-03-05 14:33:13 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Lipu Fei
6c42b662c8 Add doc for apply_to_all in XMLMaterialProfile 2018-03-05 10:54:01 +01:00
Aleksei S
6781627672 Fix: Flat model and reset all rotation did not work 
CURA-5039
 2018-03-05 10:42:09 +01:00
Lipu Fei
1e467b66c0 Fix protected variable access 2018-03-05 10:22:11 +01:00
Lipu Fei
2567642626 Remove outdated TODO 2018-03-03 16:13:35 +01:00
Lipu Fei
ca88e0df88 Add doc for calllater active machine in project loading 2018-03-03 16:12:33 +01:00
Ian Paschal
1f403f815d CURA-4972 Moved validation to SettingOverrideDecorator.py 
**The diagnosis:**
The issue arrises from the fact that while the original object is subscribed to be validated, that subscription is only created by setting it as a settings override object. A clone of that object, while still a settings-override object, never gets subscribed because it's not explicitly set with the tool.

**The solution (?):**
I moved all the validation stuff over to SettingOverrideDecorator.py, and use its onSettingChanged() function to trigger the validation. Unfortunately, I can't use the timer because of some limitation with QTTimer and threads. So it's _a bit laggy in some places, and I'd be open to tips about how to fix this. It does work reliably though.
 2018-03-02 17:05:58 +01:00
Jack Ha
53ec846436 CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager 2018-03-01 17:21:35 +01:00
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Jack Ha
657a52a5e7 CURA-4400 add checking for enabled extruder in setting _outside_buildarea, cleaned up a bit and factored some functions out BuildVolume 2018-03-01 11:54:31 +01:00
Jack Ha
11bad271d3 CURA-4400 set extruder numbers of settings to an enabled extruder; added SettingOverrideDecorator by default in CuraSceneNode 2018-02-28 15:56:45 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ian Paschal
f646f11020 CURA-4890 Removed print() statement. 2018-02-28 15:16:04 +01:00
Ian Paschal
3eab99c25c CURA-4890 Empty material no longer displayed as Unknown 
"Get learned how to make Cura more better-er!"
 2018-02-28 15:06:02 +01:00
Aleksei S
77a624d3b4 In monitor view show Finished for "wait_user_action" in printjob.status 
CURA-4873
 2018-02-28 13:04:51 +01:00
Jack Ha
f28bed9b4f CURA-4400 not sending objects that are printed with a disabled extruder 2018-02-28 12:56:39 +01:00
Lipu Fei
07824c21e1 Move getMachineDefinitionIDForQualitySearch() into QualityManager.py 2018-02-28 11:48:20 +01:00
Lipu Fei
615b20aa5b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 09:51:26 +01:00
Ian Paschal
62e7cb9a2d CURA-4972 Allow reslice after setting is removed 
The issue Andreea found was caused by the fact that the object was unsubscribed from setting validation while still having the illegal value, because the setting (and its illegal value) was removed AFTER unsubscribing. Thus the illegal value got "saved" until the next time you added that setting and set the correct value.
 2018-02-27 16:05:07 +01:00
Lipu Fei
632e0469fb Fix 3MF Reader 2018-02-27 16:01:11 +01:00
Lipu Fei
f304e7f2e7 Revert "Use userChanges instead of getTop()" 
PerObjectContainerStacks are not CuraContainerStacks, so we cannot use "userChanges"
with it.
 2018-02-27 16:01:11 +01:00
Lipu Fei
2f86687320 Fix init machine for machines loaded from project files 2018-02-27 13:49:45 +01:00
Jack Ha
22cf5abec2 Merge branch 'master' into refactoring_machine_manager 2018-02-27 10:24:56 +01:00
Lipu Fei
ccd4bb285b Use userChanges instead of getTop() 2018-02-26 19:40:31 +01:00
Lipu Fei
12c51f4066 Use setActiveMachine() in project loading 2018-02-26 17:05:55 +01:00