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
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
Lipu Fei
67f820af04 Pass tray_icon_name to QtApplication 
CURA-4032
 2017-08-14 15:26:17 +02:00
alekseisasin
bc4b1d9c4d Merge remote-tracking branch 'origin/2.7' 2017-08-14 15:11:33 +02:00
Ghostkeeper
3316f3aa13
Add warning contexts to not translate XML tags 
This went wrong a few times with previous translations. Let's hope that this prevents it from happening again.

Contributes to issue CURA-4113.
 2017-08-14 14:06:20 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated 
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
 2017-08-14 13:54:11 +02:00
Lipu Fei
dce575f661 Remove wall_extruder_nr from ExtruderManager.getUsedExtruderStacks 
CURA-4145
 2017-08-14 13:39:56 +02:00
Lipu Fei
bb1316fc88 Check if a material is being used based on base_file 
CURA-4129
 2017-08-14 08:48:07 +02:00
Lipu Fei
3e870d2e40 Always update raft thickness and extra z clearance before rebuilding the build volume 
CURA-4154
 2017-08-11 12:27:45 +02:00
Lipu Fei
4bac499c22 Use QualityManager._getFilteredContainersForStack() to get qualities 
CURA-4151

The quality searching code in _configureProfile() for importing quality
profiles doesn't take into account base materials. Use the function in
QualityManager to solve this problem.
 2017-08-10 12:14:43 +02:00
Lipu Fei
6fd3963e8f Fix material searching in isContainerUsed() 
CURA-4129

Searching for used materials should also take into account the material
container ID.
 2017-08-09 09:47:36 +02:00
Lipu Fei
e414621250 Fix code style 2017-08-09 09:27:42 +02:00
Lipu Fei
ab3d8349b6 Also skip empty containers when getting layer height for a quality profile 
CURA-4133

On some machines such as UM2, there is no material. Getting the layer
height in this case will result back to the global stack itself, which
is the layer height of the current setting. This is a problem for
"Normal" (or "Fine") quality because it uses the machine's default layer
height.
 2017-08-09 09:24:04 +02:00
Lipu Fei
8c6abc85fc Rename variable in for loop 
CURA-4129
 2017-08-08 16:32:40 +02:00
Lipu Fei
bb1475d1fd Search for instance containers with type material 
CURA-4129
 2017-08-08 16:32:02 +02:00
Ghostkeeper
b9cdeb68d6
Don't crash when there is no global quality container 
We fill the stack with an empty container rather than with None in that case.

Contributes to issue CURA-3301.
 2017-08-08 14:40:02 +02:00
Ghostkeeper
fe406f530c
Never fill None for quality changes profile 
We want it to be the empty profile instead. This gets passed on all the way to _replaceQualityOrQualityChangesInStack where the metadata is requested.

Contributes to issue CURA-3301.
 2017-08-08 13:51:40 +02:00
Ghostkeeper
a75387ff3e
Only use Z-hop setting for the used extruders 
Otherwise the unused extruders still influence the build volume.
 2017-08-08 11:40:19 +02:00
fieldOfView
975e7f04b4 Remove unused incorrect code 
The property is called activeMaterialIds, but it returns the stack ids. The code is superceeded by allActiveMaterialIds.
 2017-08-08 11:27:45 +02:00
Lipu Fei
4a34f141d1 Check if a material container is used by GUID 
CURA-4129

isContainerUsed() is used to enable/disable the "Remove" button on the
Material Manager dialog. When a custom material is created, it creates
multiple containers, one for each extruder variant. In the dialog, it
only checks if the material for the currently active extruder is being
used or not. This causes a problem when 2 extruders are of different
types and one uses a custom material. Then, the "Remove" button will
not be correctly enabled/disable in the Material Manager dialog when
the other extruder is activated.
 2017-08-07 13:17:47 +02:00