Commit graph

10323 commits

Author SHA1 Message Date
Remco Burema
29e68fe407
Fix default value min_skin_width_for_expansion.
At some point max_skin_angle_for_expansion s deafult value was updated, but the default value for its child, min_skin_width_for_expansion wasn't altered to reflect that. Fixes #7925
2020-06-12 11:43:37 +02:00
Nino van Hooff
64064fe8d5
Merge pull request #7911 from Ultimaker/CURA-7479_ConfigurationMenu_nozzles_get_stacked_together
CURA-7479: Change preferredWidth according to the model count in ConfigurationMenu
2020-06-10 16:26:26 +02:00
Ghostkeeper
ae272d42b8
Align build plate correctly to build volume
I don't know how this came to be misaligned. Maybe an oversight.

Contributes to issue CURA-7497.
2020-06-10 14:59:11 +02:00
Ghostkeeper
c9b2f4a2d2
Merge branch 'dagoma_bicolor' of https://github.com/0r31/Cura into 0r31-dagoma_bicolor 2020-06-10 14:50:44 +02:00
orel
ddc8785755 Add 3mf meshes for mono extruder disco printers 2020-06-10 12:39:02 +02:00
Nino van Hooff
feeeb972f7
Merge pull request #7873 from Ultimaker/CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account
CURA-7438 Handle the case when a cloud printer is removed from the account
2020-06-10 11:46:10 +02:00
orel
36f70e43c2 Extruders gcodes sequences were inverted... 2020-06-10 11:43:44 +02:00
orel
7c6104b812 Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-10 11:42:48 +02:00
Kostas Karmas
df2c20f647 Convert back Row to RowLayout
RowLayout is better for resizable interfaces

CURA-7479
2020-06-10 11:37:51 +02:00
Kostas Karmas
62047d585f Convert RowLayout into Row in ConfigurationMenu
CURA-7479
2020-06-10 11:23:17 +02:00
Ghostkeeper
d9c768e0d3
Merge branch 'CURA-7480_Remove_flicabkle_config_panel' 2020-06-08 14:26:21 +02:00
Kostas Karmas
3073d7c349 Fix height binding loop QmlWarning in ConfigurationListView
Done during Turbo Testing and Tooling
2020-06-05 15:54:53 +02:00
Ghostkeeper
9404fe0fb9
Fix getting contentWidth in variable width mode
Undefined seems to work fine as well though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-06-05 15:18:10 +02:00
Kostas Karmas
ec62cd5671 Fix "Unable to assing null to double" QmlWarning 2020-06-05 14:20:52 +02:00
Kostas Karmas
306f58f96e Fix contentWidth reference error in ActionButton 2020-06-05 14:13:36 +02:00
Ghostkeeper
7ec681a04d
Merge branch 'feature_support_meshes_present' of https://github.com/fieldOfView/Cura into fieldOfView-feature_support_meshes_present 2020-06-05 13:20:31 +02:00
Kostas Karmas
9e891c201b Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 15:25:43 +02:00
Kostas Karmas
4bebaaaddb Display an appropriate tooltip when device is removed from the account
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
2020-06-04 15:08:27 +02:00
Kostas Karmas
65dd0250b3 Change property connectionStatusMessage into a get function
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
2020-06-04 14:22:14 +02:00
Jaime van Kessel
c095cb1f22
Converted the listview into a RowLayout
I have no idea why i thought a listview was needed for this when
this was made. The data shouldn't be flicable, so it makes way more sense to
use a row layout

CURA-7480
2020-06-04 14:06:03 +02:00
Ghostkeeper
1d6c722505
Indent using spaces, not a mix of tabs and spaces
Contributes to issue CURA-7450.
2020-06-04 13:14:56 +02:00
Ghostkeeper
06dce91bef
Merge branch 'master' of https://github.com/grk3010/Cura into grk3010-master 2020-06-04 13:06:08 +02:00
Jaime van Kessel
d4eba3d089
Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' of github.com:Ultimaker/Cura 2020-06-04 11:27:41 +02:00
Kostas Karmas
230ba01d14 Merge branch 'CURA-7460_Change_popup_tooltip_when_printer_is_offline' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 10:46:54 +02:00
fieldOfView
c34162a2ba Merge branch 'master' into feature_support_meshes_present
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
2020-06-04 10:27:11 +02:00
Orel
e537af24da Refine platform offset 2020-06-03 20:14:10 +02:00
Orel
93715bf2ad Replace 3mf to stl files for mono extruder dagoma printers 2020-06-03 20:05:15 +02:00
Orel
5079009ccd Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-03 20:04:16 +02:00
Ghostkeeper
6d1d6ca1aa
Add warning for Support Wall Line Count if breaking up support in chunks
It will be hard to break it up then.

Fixes #7841.
2020-06-03 10:51:43 +02:00
Orel
6544fa31f4 Add 3mf meshes for single extrusion dagoma disco printers 2020-06-02 19:10:32 +02:00
Orel
b0edcc1c18 Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-02 18:27:30 +02:00
Kostas Karmas
323d2d4019 Update setting_version to 15 for ATMAT machine profiles
Following PR https://github.com/Ultimaker/Cura/pull/7030

CURA-7323
2020-06-02 16:28:49 +02:00
Konstantinos Karmas
856221f0b6
Merge pull request #7030 from gandzia44/master
ATMAT machines profiles
2020-06-02 16:25:55 +02:00
Kostas Karmas
a06035cf38 Display appropriate tooltip message when cloud printer is offline
Display a different message in the popup tooltip when the internet
is reachable but the printer is offline.

CURA-7460
2020-06-02 16:12:05 +02:00
Jaime van Kessel
73026a0744
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-02 14:20:35 +02:00
Jaime van Kessel
fbbd2f7484
Fix small copy paste error
CURA-7477
2020-06-02 14:19:13 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Ghostkeeper
be814535e9
Avoid hitting the prime blob when Z hop is enabled
If Z hop is enabled, it would move to the height of the Z hop at the start of the print, in order to hop for the initial travel move. Cura sort of assumes that this hop is going up and so it's safe to do, but in reality this hop is going down due to the starting process in the firmware. As a hotfix, we'll just move away from that blob so that we don't hit it even if you enable Z hops.
2020-06-02 11:54:10 +02:00
Ghostkeeper
b68c3b7301
Remove usage of deprecated extruders property
Initially PyCharm didn't find this because it's not typed.

Done during Turbo Testing and Tooling.
2020-05-29 18:06:02 +02:00
Ghostkeeper
fc6867a4a0
Use extruderList rather than deprecated extruders property
Done during Turbo Testing and Tooling.
2020-05-29 17:56:56 +02:00
Ghostkeeper
458acb356f
Use extruderList rather than deprecated extruders property
Once more into the fray.

Done during Turbo Testing and Tooling.
2020-05-29 17:55:12 +02:00
Ghostkeeper
5e73412a67
Merge branch 'master' of https://github.com/5axes/Cura into 5axes-master 2020-05-29 11:29:53 +02:00
Ghostkeeper
2a70813d03
Correct orientation of printer volume
This seems to have been a mix-up of 'depth' and 'height'. The specs online say that these are the correct dimensions.

Fixes #7827.
2020-05-28 12:59:40 +02:00
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status
CURA-7437_no_internet_cloud_status
2020-05-28 10:02:15 +02:00
5axes
44ebb0360e
changement primaire _> d'amorçage
terme primaire pour prime pas équivalent en français   -> d'amorçage
2020-05-27 23:11:44 +02:00
Orel
38fce5aa0e Remove useless newlines 2020-05-27 19:13:05 +02:00
Nino van Hooff
e24797b94e Fix tooltip with alpha 0 stealing clicks
CURA-7437
2020-05-27 17:21:50 +02:00
Nino van Hooff
8a12f539b5 Fix connection status z-order
CURA-7437
2020-05-27 16:37:48 +02:00
Jaime van Kessel
b58730a70c
Fix decoding in recently opened menu
Fixes #7820
2020-05-27 15:30:22 +02:00
Konstantinos Karmas
e0734ff130
Merge pull request #7681 from sm3dp/add-lotmaxx-sc60-printers
Added Lotmaxx sc60 profile
2020-05-26 16:42:30 +02:00