3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10086 commits 313 branches 275 tags 719 MiB
Commit graph

2284 commits

Author SHA1 Message Date
Lipu Fei
fc7207e77e Remove "Sync" button 
CURA-4211
 2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +02:00
Jaime van Kessel
8472830fb9 Fix adding machine prefix 
CURA-4276
 2017-09-05 13:30:42 +02:00
Jaime van Kessel
204e1ee834 PrintJobname is now only set when it was empty or if it's set to empty 
CURA-4276 fixes #2346
 2017-09-05 11:41:30 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Vivek Anand
ee1ba30d0e CuraApplication: Minor pep8 fix 2017-09-02 12:01:38 +00:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
Ghostkeeper
b677a81d9b
Change default theme 
This new field is now read by Uranium that indicates the default theme to load first before there are any changed preferences.

Contributes to issue CURA-4148.
 2017-08-30 16:08:49 +02:00
Lipu Fei
23544ad1fe Only fall back to use fdmprinter when the quality profiles for the current machine cannot be found 
CURA-4139

UM2 family don't have machine material, but they do have their dedicated
profiles. When Cura searches for quality profiles, it should only fall
back to use "fdmprinter" as the definition if no quality profile can be
found for the current machine.
 2017-08-30 14:59:12 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Lipu Fei
b84500f742 Import Application instead of inline import CuraApplication 
CURA-4186
 2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7 Fix code style: double quotes instead of single quotes 
CURA-4186
 2017-08-28 14:34:53 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported 
So I added a function that checks the support on all extruders and the global stack.

Contributes to issue CURA-4148.
 2017-08-25 14:27:45 +02:00
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed. 
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
 2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first 
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
 2017-08-25 12:19:05 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack 
CURA-4186
 2017-08-25 11:57:52 +02:00
Lipu Fei
50a7e8146f Add a dedicated stack class for per-object settings 
CURA-4186

Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
 2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735 Add missing context in getProperty() in global and extruder stacks 
CURA-4186

All getProperty() calls should use the provided context.
 2017-08-24 17:01:03 +02:00
Lipu Fei
759d44dbef Add stack context for function evaluation 
CURA-4186
 2017-08-23 14:39:08 +02:00
Jaime van Kessel
904682945a Decreased the value of the u_z_bias, so the plate quad is drawn again. 
CURA-4150
 2017-08-23 12:48:19 +02:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1 Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura 2017-08-23 11:11:45 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus 
Fix multiextruder menus
 2017-08-23 09:08:48 +02:00
Ghostkeeper
03311132f0
Merge branch 'feature_grid_lines' 2017-08-22 16:41:45 +02:00
Ghostkeeper
18b88065f4
Render build plate slightly lower than grid to prevent Z fighting 
Looks much better.

Contributes to issue CURA-4150.
 2017-08-22 16:40:11 +02:00
alekseisasin
a0b7a2d165 Merge branch 'feature_grid_lines' 
CURA-4150
 2017-08-22 13:59:19 +02:00
Ghostkeeper
25c5c5a888
Add minor grid cells for circular build plates 
Same technique as the major grid cells.

Contributes to issue CURA-4150.
 2017-08-21 10:24:53 +02:00
Ghostkeeper
3b93a9d309
Add grid lines for circular build plates 
Some trigonometry is involved to find the correct lengths for the lines.

Contributes to issue CURA-4150.
 2017-08-21 10:21:25 +02:00
Ghostkeeper
d8dd9c0d3a
More efficient and elegant grid line creation 
Since the zero point is always in the centre, we can just re-use this loop to prevent code duplication and gain a minor speed increase.

Contributes to issue CURA-4150.
 2017-08-21 09:44:39 +02:00
Ghostkeeper
e7c5854694
Make grid size into global variables 
It doesn't need to be a preference, but it should be easy to modify in the code.

Contributes to issue CURA-4150.
 2017-08-21 09:24:31 +02:00
fieldOfView
43c6801e58 Find a material with the correct diameter when adding a printer 2017-08-20 16:52:56 +02:00
Jaime van Kessel
bab61b7f47 Merge branch 'master' of github.com:Ultimaker/Cura 2017-08-18 11:09:28 +02:00
Jaime van Kessel
1d9ac09053 No longer attempt to create monitorView if none was set 2017-08-18 11:09:02 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
Jaime van Kessel
145b6825db Fixes #2284 2017-08-18 09:45:28 +02:00
Lipu Fei
b20711ef7c Remove incorrect maximum extruder count check 
CURA-4188
 2017-08-17 16:36:57 +02:00
Ghostkeeper
585b6ad8eb
Remove superfluous grid shader 
The grid shader is now exactly equal to the colour shader, so let's just use the colour shader.

Contributes to issue CURA-4150.
 2017-08-17 15:25:27 +02:00
Ghostkeeper
bb3f8d085b
Fix transparency of minor grid cells 
You need to turn it on manually, apparently.

Contributes to issue CURA-4150.
 2017-08-17 10:35:00 +02:00
Ghostkeeper
38e907b3ae
Add minor grid lines 
Makes it feel very professional and technical.

Contributes to issue CURA-4150.
 2017-08-17 10:32:47 +02:00
Ghostkeeper
6da5dda44f
Initialise _grid_color in __init__ 
All fields should always be defined throughout the lifetime of every object, according to code style.

Contributes to issue CURA-4150.
 2017-08-17 10:21:48 +02:00
Ghostkeeper
5e63c0df48
Add major grid cells 
This draws a grid of 1x1cm.

Contributes to issue CURA-4150.
 2017-08-17 09:56:11 +02:00
Ghostkeeper
484740f2ff
Remove grid pattern 
It'll be replaced by grid lines instead of grid surfaces.

Contributes to issue CURA-4150.
 2017-08-16 13:26:17 +02:00
Lipu Fei
1c747a962f Merge remote-tracking branch 'CURA-4032' 2017-08-15 16:11:44 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 14:45:34 +02:00
Lipu Fei
9aa65eab44 Merge branch '2.7' 2017-08-15 14:43:36 +02:00
Lipu Fei
e67286c0d8 Do not add extruder stacks for single-extrusion machines 
CURA-4167

In the current architecture, single-extrusion machines don't have
extruder stacks.
 2017-08-15 14:19:23 +02:00