GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 23:56:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,997 Commits 290 Branches 260 Tags
Commit Graph

3479 Commits

Author SHA1 Message Date
Ghostkeeper
bc28189ff5
Don't serialize the name of the metadata 
It's being serialized in a different place.

Contributes to issue CURA-4243.
 2017-12-04 10:55:30 +01:00
Diego Prado Gesto
288aba0ec4 CURA-4667 Fix simulation view render race. Change the place where the 
layer data is reset.
 2017-12-04 10:18:53 +01:00
Mark Burton
ad4a27db3a Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards. 
This ensures that the layer data is reset before the scene is rendered.
 2017-12-04 10:18:21 +01:00
Diego Prado Gesto
c3d9c1b3d8 CURA-4667 Fix simulation view render race. Change the place where the 
layer data is reset.
 2017-12-04 09:49:03 +01:00
Andreea Scorojitu
d5c55ae7d3 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-12-04 09:34:39 +01:00
Andreea Scorojitu
184bfc9dfd Update_ChangeLog_3.1_CURA-4656 2017-12-04 09:34:30 +01:00
Mark Burton
033a4615eb Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards. 
This ensures that the layer data is reset before the scene is rendered.
 2017-12-01 17:47:08 +00:00
Ghostkeeper
17ede12573
Also set base_file metadata when deserialising just metadata 
Contributes to issue CURA-4243.
 2017-12-01 16:07:30 +01:00
ChrisTerBeke
867836bd76
Merge pull request #2773 from fieldOfView/fix_usb_target_temperatures 
Show USB target temperatures, (estimated) time and jobname
 2017-12-01 15:29:37 +01:00
ChrisTerBeke
af2b370921
Merge pull request #2857 from fieldOfView/fix_cluster_postprocessing 
Allow postprocessing before sending data to the printer
 2017-12-01 15:12:53 +01:00
Ghostkeeper
ffc439852f
Merge branch '3.1' 2017-12-01 15:00:34 +01:00
Lipu Fei
a425a1c51b Fix legacy profile loading 
CURA-4075
 2017-12-01 14:57:59 +01:00
ChrisTerBeke
7cc953d8e7
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials 
Hide material diameter when the machine has no materials
 2017-12-01 14:56:36 +01:00
Ghostkeeper
2236e0016d
Merge branch '3.1' 2017-12-01 14:41:41 +01:00
Diego Prado Gesto
21d61ce21e Fix an error that makes Cura crash when introducing commas in the 
textfields in the ImageReader panel. Now it's possible to use commas xor
dots for separating decimal values.
 2017-12-01 14:26:53 +01:00
Andreea Scorojitu
0fe51589ac Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-12-01 13:29:05 +01:00
Andreea Scorojitu
5202c8584c Update_ChangeLog_3.1_CURA-4656 2017-12-01 13:26:38 +01:00
Diego Prado Gesto
e7ac2e37b4 Fix an error when closing USB connection. This error raised several 
times in the crash reports in the stats.
 2017-12-01 13:17:36 +01:00
Lipu Fei
7b4cb11240 Fix legacy profile upgrade 
CURA-4075

Only for single-extrusion machines just like before.
 2017-12-01 11:20:52 +01:00
Lipu Fei
7de43e71e0 Fix legacy profile upgrade 
CURA-4075

Only for single-extrusion machines just like before.
 2017-12-01 11:06:14 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1' 2017-11-30 16:57:01 +01:00
ChrisTerBeke
47c1c1a8bf
Merge pull request #2883 from fieldOfView/fix_machinesettings_gcode_flavor_materials 
[regression] Fix material container for extruder when changing gcode flavor
 2017-11-30 16:30:13 +01:00
ChrisTerBeke
d76081ae1d Only restore global profile based on extruders that are actually in use when loading legacy project file 2017-11-30 16:24:46 +01:00
ChrisTerBeke
3abf067d25 Fix loading .curaproject files with stack setups from earlier versions - CURA-4646 2017-11-30 15:24:51 +01:00
Jaime van Kessel
51c4062f1b Limit the amount of emits happening for PrintJobs changed 
CL-541
 2017-11-30 15:17:08 +01:00
fieldOfView
4b0ff6e5f4 Prevent start & end gcode snippets being double encoded 2017-11-30 15:16:09 +01:00
Jaime van Kessel
1c1c195b93 When an printer gets added / removed, this is now correctly shown 
CL-541
 2017-11-30 15:01:28 +01:00
Jaime van Kessel
339d7ca4c9 Cluster shows default controlItem again when a specific printer is selected 
CL-541
 2017-11-30 14:36:53 +01:00
Jaime van Kessel
d8c4834362 Aborting & pausing prints is now possible again from the Cluster output device 
CL-541
 2017-11-30 13:20:58 +01:00
Jaime van Kessel
dea13899b3 Cluster can now "target" one of it's printers for display 
CL-541
 2017-11-30 13:07:01 +01:00
Jaime van Kessel
a49d3dbd8e Added missing time/date completed 
CL-541
 2017-11-30 11:57:14 +01:00
fieldOfView
e8a7237391 Fix updating material container for extruder when changing gcode flavor 
Since single extrusion printers have a single extruder stack now, material container needs to be set on the extruder stack instead of the global stack
 2017-11-30 11:46:06 +01:00
Jaime van Kessel
70cfbf0180 PostPrintjobFinished now hides messages & resets state 
CL-541
 2017-11-30 11:44:18 +01:00
Jaime van Kessel
f30f0a7194 Mismatched configuration is now shown correctly again 
CL-541
 2017-11-30 11:04:13 +01:00
Jaime van Kessel
3d3b140526 Times are correctly displayed for Cluster again 
CL-541
 2017-11-30 10:53:38 +01:00
Diego Prado Gesto
b425672ad0 CURA-4643 Allow using the ESC/ENTER keys for reject or accept the 
user agreement
 2017-11-30 09:31:07 +01:00
Ruben D
c1ba64fd9e
Correct variants after all metadata is loaded 
As explained in the block of documentation, we can't find the variants because there is no guarantee that the variants have been loaded by the time that the metadata of materials is deserialised and we don't know their IDs either (so no lazy loading). This registers a function to be called upon completely loading the metadata, which runs a query on the metadata to find the variant by its definition and name. A bit hacky but I see no better solution.

Contributes to issue CURA-4243.
 2017-11-30 00:10:02 +01:00
fieldOfView
d5d75aca19 Hide material diameter when the machine has no materials 
eg Ultimaker 2 when using UltiGcode
 2017-11-29 22:46:17 +01:00
Ghostkeeper
c34de83e3f
Use isLoaded to check if a material is already loaded 
This prevents us from having to make an expensive findContainers call if it's not necessary, and also prevents us from unnecessarily loading the subcontainers in a loop during loading.

Contributes to issue CURA-4243.
 2017-11-29 18:04:07 +01:00
Ghostkeeper
cacc4b8586
Properly set the definition to the currently processed machine 
Otherwise all of them stay at fdmprinter.

Contributes to issue CURA-4243.
 2017-11-29 16:41:20 +01:00
Lipu Fei
e1167ee68f Fix disableKeyButtons in UserAgreement dialog 
CURA-4643
 2017-11-29 14:33:19 +01:00
Lipu Fei
4586e3dd55
Merge pull request #2375 from Ghostkeeper/optimise_sending_slice_job 
Optimise sending slice job
 2017-11-29 14:13:37 +01:00
Aleksei Sasin
0b9f7c85c8 Skip keyboard clicks for authentication dialog 
CURA-4643
Please enter the commit message for your changes. Lines starting
 2017-11-29 14:07:23 +01:00
Ghostkeeper
99cd139ba4
Remove setting definition double 
Contributes to issue CURA-4243.
 2017-11-29 13:39:24 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types 
Improved mesh type UX (Per Model Settings)
 2017-11-29 13:24:38 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality 
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
 2017-11-28 17:30:00 +01:00
Ghostkeeper
c63ef6fed6
Remove unused variables 
The machine_name variable is later redefined.

Contributes to issue CURA-4243.
 2017-11-28 16:58:04 +01:00
ChrisTerBeke
263230f9d2 Merge branch '3.1' 2017-11-28 15:45:57 +01:00
ChrisTerBeke
f41759e1dc Fix binding extruder manager in machine actions view - CURA-4568 2017-11-28 15:20:05 +01:00