3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
7424 commits 302 branches 270 tags 773 MiB
Commit graph

7424 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
5e4c99f7e0 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 12:00:37 +02:00
Jaime van Kessel
f60146ad26 Active quality ID is selected from active stack instead of global 
CURA-2624
 2016-10-12 11:59:54 +02:00
Ghostkeeper
4f5f959746
Merge branch '2.3' 2016-10-12 11:42:28 +02:00
Ghostkeeper
d9b428e6c8
Get material IDs from correct definition id if quality_definition 
For printers with a quality_definition, such as UM2E+, the material ID needs to be taken for the definition ID specified in the quality_definition metadata field. The self.activeQualityDefinitionId takes care of that, even though it is named wrong (as it applies to materials as well as quality profiles).

Contributes to issue CURA-2600.
 2016-10-12 11:42:07 +02:00
Simon Edwards
ef3e8dc4fa Make sure that the activeQualityChanged signal is emitted when the _active_container_stack changes. 
CURA-2271
 2016-10-12 11:31:18 +02:00
Jaime van Kessel
80a5978d54 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-11 17:04:04 +02:00
Jaime van Kessel
7914e90702 Merge branch 'cura-2605' of github.com:Ultimaker/Cura into 2.3 2016-10-11 16:39:12 +02:00
fieldOfView
34630fa646 Also show the "unsupported" warning when a custom profile is selected 
...by making sure we're looking at the quality container (not quality_changes) of the active extruder/stack

CURA-2271
 2016-10-11 16:36:32 +02:00
Arjen Hiemstra
9e18d2571a Merge branch '2.3' 
* 2.3:
  Replace all instances of "layer_height" in functions with resolveOrValue
  Fix "unsupported" warning on UM2+ 0.25 and 0.8 variants
 2016-10-11 16:04:13 +02:00
Arjen Hiemstra
50390dae03 Replace all instances of "layer_height" in functions with resolveOrValue 
Since we have layer_height in quality profiles (and cannot remove it) we
need to handle this. It turns out using resolveOrValue is a quick fix.

Fixes CURA-2604
 2016-10-11 16:03:57 +02:00
fieldOfView
95fabbaf6d Don't allow creating profiles based on empty_profile 
...because empty_profile has no quality_type
CURA-2271
 2016-10-11 15:22:17 +02:00
Jack Ha
d45f61f778 Comment. CURA-2605 2016-10-11 15:13:16 +02:00
fieldOfView
e312530840 Fix errors on profiles page for unsupported material combinations 
CURA-2271
 2016-10-11 15:07:27 +02:00
Jack Ha
b119be7d11 Remove settings from extruder that are not settable_per_extruder. CURA-2605 2016-10-11 15:00:17 +02:00
fieldOfView
f2e054b449 Fix the active quality id 
activeQualityId and activeQualityName were not referencing the same profile. activeMaterialName seems to have the correct one.

CURA-2271
 2016-10-11 14:27:02 +02:00
fieldOfView
bf0c6dc1d4 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 14:21:57 +02:00
fieldOfView
16d5633b74 Fix "unsupported" warning on UM2+ 0.25 and 0.8 variants 
Contributes to 2271, fixes 2616
 2016-10-11 14:21:40 +02:00
Tim Kuipers
b7096c8f72 Merge branch '2.3' 2016-10-11 14:09:34 +02:00
Tim Kuipers
70ab3d7b1b Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-11 14:08:18 +02:00
Tim Kuipers
63afe917e5 JSON fix: combing mode has link icon now (CURA-2568) 2016-10-11 14:08:10 +02:00
fieldOfView
1bafe75664 Merge branch '2.3' 2016-10-11 13:40:10 +02:00
fieldOfView
15a870c050 Add some documentation 
CURA-2544
 2016-10-11 13:39:44 +02:00
fieldOfView
1fd7c2793c Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 13:35:27 +02:00
fieldOfView
7e99fcc5d7 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 13:35:04 +02:00
fieldOfView
d04e6a6644 Use buffered writing for writing gcode to removable drives 
GCode files are still written line by line, but python is instructed to use buffering. This greatly decreases the total time required to write large(ish) files to USB drives, while having minimal impact on memory use.

CURA-2544
 2016-10-11 13:34:48 +02:00
Ghostkeeper
0c604ca002
Update translation of PostProcessingPlugin 
These were missed previous time because I had my extract script set-up wrong.

Contributes to issue CURA-570.
 2016-10-11 13:34:02 +02:00
Jack Ha
aefa21c76b Moved functions to better place. CURA-2449 CURA-2589 2016-10-11 13:05:24 +02:00
Tim Kuipers
311ebdc3ba fix: changelog clarity improvements suggested by nickthetait (CURA-2000) 2016-10-11 11:35:20 +02:00
Tim Kuipers
3b38d52c75 fix: changelog bugfixes formatting (CURA-2000) 2016-10-11 11:22:16 +02:00
fieldOfView
0af42587b0 Fix jobname when opening multiple files at once 2016-10-10 18:42:55 +02:00
fieldOfView
6852e59404 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-10 17:50:01 +02:00
fieldOfView
879ab529f2 Fix deleting grouped object using the context-menu 
CURA-2573
 2016-10-10 17:48:00 +02:00
Tim Kuipers
b38bb5a007 fix: nylon has standby temp 175 (CURA-2567) 2016-10-10 17:17:41 +02:00
Simon Edwards
2f8163b843 Merge branch '2.3' 2016-10-10 15:16:59 +02:00
fieldOfView
b4a2a0a417 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-10 14:35:08 +02:00
fieldOfView
472ba7ed26 Fix exporting materials for machines other than those in the product_id_map 
CURA-2583
 2016-10-10 14:34:53 +02:00
Arjen Hiemstra
4464b7d40a Fix installation of AppData file 2016-10-10 13:38:03 +02:00
Arjen Hiemstra
c67d698940 Merge branch '2.3' 
* 2.3:
  Return the empty container if there are no results when listing qualities
  Return empty quality instead of None in QualityManager::findQualityByQualityType
  Put material selection in warning state for unsupported materials
 2016-10-10 13:37:31 +02:00
Arjen Hiemstra
c6afb14a09 Return the empty container if there are no results when listing qualities 
Contributes to CURA-2271
 2016-10-10 13:34:45 +02:00
Arjen Hiemstra
68662561e8 Return empty quality instead of None in QualityManager::findQualityByQualityType 
Contributes to CURA-2271
 2016-10-10 13:23:43 +02:00
fieldOfView
fea0dfdfa1 Put material selection in warning state for unsupported materials 
CURA-2271
 2016-10-10 13:19:20 +02:00
fieldOfView
4e507a203a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-10 13:13:45 +02:00
fieldOfView
99ca2f7752 Put material selection in warning state for unsupported materials 
CURA-2271
 2016-10-10 13:12:56 +02:00
Tim Kuipers
cece4b0f41 fix: nylon has standby temp 175 (CURA-2567) 2016-10-10 11:02:43 +02:00
Ghostkeeper
aff66cf24b Merge pull request #1031 from hughsie/wip/hughsie/appdata 
Add an example AppData file so that Cura is visible in Linux software…
 2016-10-10 10:26:51 +02:00
Jack Ha
83caa334a2 Also wait for lock file in saveSettings. CURA-2449 2016-10-10 09:09:31 +02:00
Jack Ha
fc0417bd45 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-09 11:54:48 +02:00
Jack Ha
8b0d6e974a Added lock file writing and checking. CURA-2449 2016-10-09 11:54:34 +02:00
Ghostkeeper
608248bec8
Fix display of inherited materials 
Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId.

Contributes to issue CURA-2576.
 2016-10-08 17:14:24 +02:00
fieldOfView
90c3a09bc0 Add tooltip for formulas on profile overview tabs 2016-10-08 15:15:12 +02:00