3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -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
Arjen Hiemstra
aed23ca17e Merge branch '2.3' 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
 2016-10-24 17:10:41 +02:00
Arjen Hiemstra
8ce81fec9f Expand logic for showing the inherit button in SettingItem 
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Arjen Hiemstra
bdaa4a5a6d Add a method to get overrides for a specified (extruder)stack 
Since the main getOverrides method only accounts for the active extruder
and we sometimes need to check other extruders in case of
limit_to_extruder.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Jaime van Kessel
b718109f72 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-24 15:33:33 +02:00
fieldOfView
c0824260a3 Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-24 14:45:26 +02:00
Arjen Hiemstra
448d7d890c Merge branch '2.3' 
* 2.3:
  Set encoding to utf-8 when writing files
  Remove manually specified utf-8 encoding
  SettingInstanceManager now also watches containerchanged of extruder stacks
 2016-10-24 14:30:22 +02:00
Arjen Hiemstra
bfec96f584 Set encoding to utf-8 when writing files 
Since we assume utf-8 in a lot of places.

Contributes to CURA-2692
 2016-10-24 14:28:20 +02:00
Arjen Hiemstra
be0e48664a Remove manually specified utf-8 encoding 
Since SaveFile now defaults to UTF-8
 2016-10-24 14:28:20 +02:00
Jaime van Kessel
53f360ca1c Merge branch 'global_quality_profiles' of github.com:Ultimaker/Cura into 2.3 2016-10-24 14:23:50 +02:00
Jaime van Kessel
7b65297a31 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-24 13:51:37 +02:00
Jaime van Kessel
7f1b060ef9 SettingInstanceManager now also watches containerchanged of extruder stacks 
CURA-2674
 2016-10-24 13:50:49 +02:00
Arjen Hiemstra
3d63df7471 Merge branch '2.3' 
* 2.3:
  Use the machine/extruder ID as base for duplicated profile ID
  Fix "critical" error when starting with no active machine
 2016-10-24 13:40:57 +02:00
Arjen Hiemstra
f952b45a62 Use the machine/extruder ID as base for duplicated profile ID 
Instead of using the ID of the duplicated container, which would cause
the profile ID to be the old ID with the new ID appended.

Fixes CURA-2782
 2016-10-24 13:38:22 +02:00
Arjen Hiemstra
588f49fa5f Add global profiles for UM3 so this can be tested without dependencies 
Contributes to CURA-2652
 2016-10-24 11:19:49 +02:00
fieldOfView
df78bc47af Fix "critical" error when starting with no active machine 2016-10-24 11:01:14 +02:00
Ghostkeeper
80e4c44484
Merge branch 'fieldOfView-fix_isActiveQualitySupported' 2016-10-24 11:00:40 +02:00
Ghostkeeper
e6ed890d5f Merge branch 'fix_isActiveQualitySupported' of https://github.com/fieldOfView/Cura into fieldOfView-fix_isActiveQualitySupported 2016-10-24 10:57:30 +02:00
Arjen Hiemstra
2c2bf7823f Account for empty material when switching quality changes 
Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
78ac4ef999 Set the global variant and material to empty for multi-extrusion machines 
For multi-extrusion machines, we do not want variant or material
profiles in the stack, because these are extruder specific and may cause
wrong values to be used for extruders that did not specify a value in
the extruder.

Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
e1dafc8288 Also properly set global profile when changing quality_changes profiles 
Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
e82b2c0f80 Add support for global quality profiles 
Instead of using one of the extruder profiles as global quality, use
proper global qualities.

Contributes to CURA-2646
 2016-10-24 10:57:18 +02:00
Ghostkeeper
ddf5e8a663
Merge branch 'themaninthesuitcase-printrbot_play' 2016-10-24 10:34:07 +02:00
fieldOfView
5ce237502c Fix "critical" error when starting with no active machine 2016-10-23 11:25:26 +02:00
Chris Pearson
9686c9db1c Add definition for Printrbot Play with heated bed upgrade. 2016-10-22 17:36:21 +01:00
Chris Pearson
8330b953e8 Add definition and mesh for Printrbot Play. 2016-10-22 16:36:06 +01:00
Tim Kuipers
cedb3a975e Merge pull request #1068 from fieldOfView/all_legacy_machines 
All legacy machines fixes
 2016-10-22 16:43:06 +02:00
Tim Kuipers
0bc50523d6 JSON feat: retract_at_layer_change (CURA-2780) 2016-10-22 16:20:20 +02:00
fieldOfView
0597610388 Add known manufacturers, make capitalization consistent 2016-10-22 15:37:28 +02:00
fieldOfView
eaf3c1f1dd Correct machine reference 2016-10-22 15:36:22 +02:00
Tim Kuipers
a58c247016 JSOn feat: material_print_temperature_layer_0 (CURA-2736) 2016-10-22 14:27:56 +02:00
Tim Kuipers
e1409c4f83 julia machine definition 2016-10-22 12:15:29 +02:00
Tim Kuipers
48b5632fdc all machines from legacy Cura 2016-10-22 01:10:42 +02:00
Tim Kuipers
8fb52d86e4 JSOn feat: material_bed_temperature_layer_0 (CURA-2781) 2016-10-21 18:21:38 +02:00
Tim Kuipers
d01f0053bf JSOn feat: start_layers_at_same_position, layer_start_x, layer_start_y (CURA-1112) 2016-10-21 17:46:16 +02:00
Tim Kuipers
1807f77df4 JSON feat: wall_0_wipe_dist (CURA-1698) 2016-10-21 17:01:55 +02:00
Tim Kuipers
981907d26a Revert "Revert "JSON feat: carve_multiple_volumes (CURA-2712)"" 
This reverts commit 2bff94ba9f.

reapplies 8ee22738bc
 2016-10-21 16:21:08 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Tim Kuipers
2bff94ba9f Revert "JSON feat: carve_multiple_volumes (CURA-2712)" 
This reverts commit 8ee22738bc.
 2016-10-21 16:20:39 +02:00
Tim Kuipers
8ee22738bc JSON feat: carve_multiple_volumes (CURA-2712) 2016-10-21 16:07:03 +02:00
Ghostkeeper
9c4f8ab8fb
Update change log 
This is what we have for 2.3.1 so far.

Contributes to issue CURA-2755.
 2016-10-21 14:59:41 +02:00
Tim Kuipers
c17ee18ccb JSON feat: concentric 3D infill (CURA-2772) 2016-10-21 14:16:00 +02:00
Ghostkeeper
58dba9bcb3
Dynamically get unit of layer height 
If the unit of layer height would become something else than mm eventually, it'll still be correct here.

Contributes to issue CURA-2737.
 2016-10-21 14:03:28 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down 
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.

Contributes to issue CURA-2737.
 2016-10-21 14:00:43 +02:00
Ghostkeeper
c92ccee1e4
Add layer height role to profiles model 
This layer height computation is rather complex, but because the items are now computed in a separate function, we can safely overwrite that and the update is made only once in the UI.

Contributes to issue CURA-2737.
 2016-10-21 13:59:23 +02:00
Ghostkeeper
e02284b1f0
Expose determineQualityAndQualityChangesForQualityType 
It is needed to get the quality belonging to a certain quality changes ID that is not on the global stack. We already had this function that does just that.

Contributes to issue CURA-2737.
 2016-10-21 13:11:08 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text 
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
 2016-10-21 13:06:49 +02:00
Ghostkeeper
16491d8d23
Robustly get layer height even if quality has none 
If the quality profile doesn't define a layer height (which it currently always has) then this should still get the proper layer height. It proceeds properly down the stack now.

Contributes to issue CURA-2737.
 2016-10-21 11:51:10 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu 
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.

Contributes to issue CURA-2723.
 2016-10-20 17:16:06 +02:00
Ghostkeeper
021023a932
Add property to get the current profile's layer height 
This will then be displayed in the profile selection menu.

Contributes to issue CURA-2723.
 2016-10-20 17:14:45 +02:00
Jack Ha
d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors". 
CURA-2730
 2016-10-20 16:16:33 +02:00