GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 290 Branches 260 Tags
Commit Graph

10453 Commits

Author SHA1 Message Date
Ghostkeeper
bab037554c
Avoid hitting the prime blob when Z-hop is enabled 
Similar to commit be814535e979c28734460a697da879dbe2b41a07, but ported to the Ultimaker Original.
 2020-06-12 12:01:38 +02:00
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
Remco Burema
f4dc180594
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.
 2020-06-12 11:31:13 +02:00
Remco Burema
637f14fdad
Add setting: Minimum slope steepness for stair-stepping. 
part of fixing CURA-6989 (and tickets such as CURA-6747)
 2020-06-11 19:46:25 +02:00
Jaime van Kessel
d33529f932
Use property & states instead of listening to changed signal 
It makes a lot more sense to me to use states and an actual property.

CURA-7418
 2020-06-11 17:31:19 +02:00
Jaime van Kessel
f4c5a134c2
Move palette to syncstate 
It should be there, since that is the only place it's being used

CURA-7418
 2020-06-11 17:02:37 +02:00
Jaime van Kessel
d8d3f16c9f
Remove unneeded width property 
CURA-7418
 2020-06-11 17:01:04 +02:00
Jaime van Kessel
6d86cbf03c
Convert the account details into an item 
No idea why it was a column.

CURA-7454
 2020-06-11 16:58:28 +02:00
Jaime van Kessel
1f402569ad
Move properties into account details itself 
There isn't really a point to setting them from when the object is created...

CURA-7418
 2020-06-11 16:51:42 +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
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
 2020-06-10 12:50:03 +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
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine 
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
 2020-06-09 15:33:22 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button 
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
 2020-06-09 15:20:15 +02:00
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Joyce-lujunxu
5da5dc0047
Add files via upload 2020-06-09 19:05:30 +08:00
Joyce-lujunxu
72f84ff489
Add files via upload 2020-06-09 19:04:51 +08:00
Ghostkeeper
d9c768e0d3
Merge branch 'CURA-7480_Remove_flicabkle_config_panel' 2020-06-08 14:26:21 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Mark Burton
2669fbe608 Set padding to 0 to remove vertical shift on Linux builds. 2020-06-05 15:31:57 +01: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
fieldOfView
33eaebe397 Change wording 2020-06-05 11:42:11 +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
Mark Burton
f8c86cce4d Improve readability and add comments. 2020-06-04 12:04:29 +01:00
Mark Burton
74984ca12a Stop panel growing above first tool button. 2020-06-04 11:30:13 +01: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
Mark Burton
700533b4aa Change the panelBorder rectangle anchor to the bottom for lower toolbar buttons. 
This makes the panel grow upwards into clear space rather than downwards which is a problem
when the Cura window height is restricted.
 2020-06-03 08:15:10 +01:00
Orel
6544fa31f4 Add 3mf meshes for single extrusion dagoma disco printers 2020-06-02 19:10:32 +02:00