3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28446 commits 340 branches 299 tags 734 MiB
Commit graph

6967 commits

Author SHA1 Message Date
Jaime van Kessel
f35914299b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 15:44:19 +02:00
Jaime van Kessel
a8486f88d7 Inheritance icon is correctly shown for single extrusion printers if setting has limit_to_extruder property 
CURA-2752
 2016-10-26 15:43:26 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
8da87a2996 Merge branch 'feature_show_origin' of https://github.com/fieldOfView/Cura into fieldOfView-feature_show_origin 2016-10-26 11:37:32 +02:00
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made 
Just properly check if there is a global container stack.
 2016-10-26 09:50:42 +02:00
fieldOfView
55191b722a Codestyle & documentation 2016-10-25 23:06:23 +02:00
fieldOfView
fef15c706f Render an indication of the origin of the machine 2016-10-25 22:51:44 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Jaime van Kessel
b4339bda0e Fixed logger isuse with importing profile 
CURA-2785
 2016-10-25 16:26:52 +02:00
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +02:00
Ghostkeeper
e6c68bcdc9
Add fallback if no unit is known for layer_height 
If there is no unit known, it is interpreted as there being no unit. There is currently mm, but if we changed that it is probably on purpose so we write no unit.

Contributes to issue CURA-2723.
 2016-10-25 11:28:41 +02:00
Jaime van Kessel
844b9729f4 Fixed critical errors when first adding UM3 2016-10-25 11:16:54 +02:00
Jaime van Kessel
ecbe4b264a Added handling for key not found in extruder map 2016-10-25 11:02:41 +02:00
Ghostkeeper
3e3e6e6b1b
Fix call to _configureProfile 
The footprint of the function changed, but the call wasn't updated, apparently. I pulled new_name up from one of the if-statements since they need to be computed for both branches now (and they are the same).

Contributes to issue CURA-2785.
 2016-10-24 17:39:36 +02:00
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
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
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
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
fieldOfView
df78bc47af Fix "critical" error when starting with no active machine 2016-10-24 11:01:14 +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
fieldOfView
5ce237502c Fix "critical" error when starting with no active machine 2016-10-23 11:25:26 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +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
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
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
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
Jack Ha
a23a922eec Drag profile into Cura; added importProfile(s), exportProfile to ContainerManager. CURA-787 2016-10-20 13:55:39 +02:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Jack Ha
d4f7a0e16c Bugfix in logging when trying to import broken profile. CURA-787 2016-10-20 11:39:01 +02:00
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Jack Ha
8aec11e7c3 Merge branch 'master' into feature_config_dir_lock 2016-10-19 12:43:50 +02:00
Simon Edwards
6d1f766ef3 Fixed for the inheritance icon and custom profiles. 
CURA-2674 Inheritance icon not shown for saved profile.
 2016-10-18 13:18:56 +02:00
Jaime van Kessel
cc549932c4 ConvexHull decorater no longer crashes if node has no MeshData 
Fixes CURA-2706
 2016-10-18 11:48:23 +02:00
Ghostkeeper
96e516c676
Allow for saving multiple scene nodes at the same time 
The selection saving saves the entire current selection and their child nodes.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Jaime van Kessel
9c73c248ed Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 16:14:47 +02:00
Jaime van Kessel
cda8fd5827 Revert buttons now work for single extrusion machines again 2016-10-16 16:14:05 +02:00
Jaime van Kessel
807a92957f Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 14:45:52 +02:00