GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-29 08:23:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,481 Commits 295 Branches 268 Tags
Commit Graph

28481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
7fb72a1a58 Change Skeleton folder name to MainWindow. 
This folder is intended to store the files that construct the main
window. All the parts. The rest of the components are stored in more
specific folders.

Contributes to CURA-5784.
 2018-10-17 16:13:43 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Jaime van Kessel
907ecc54bd Use the material weight as fallback 
CURA-5814
 2018-10-17 14:49:03 +02:00
Ian Paschal
6f33c4410c Review tweaks 
Contributes to CL-897 and CL-1051
 2018-10-17 14:39:42 +02:00
Tim Kuipers
0b7b395db1 have all flow settings in expert visibility 2018-10-17 14:30:59 +02:00
Tim Kuipers
59c39c0f5f move setting prime_tower_flow also in default expert visibility 2018-10-17 14:30:30 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received 
Contributes to CL-1051
 2018-10-17 14:28:17 +02:00
Jaime van Kessel
3ad113f70f Added some missing typing. 
Since i was changing some stuff here, i better leave it more typed as I found it.

CURA-5814
 2018-10-17 14:14:12 +02:00
Tim Kuipers
369994113b keep old name of prime_tower_flow 2018-10-17 14:11:58 +02:00
Tim Kuipers
3da558245f fix setting inheritance from material_flow 2018-10-17 14:11:58 +02:00
Tim Kuipers
46bb322d0b initial layer flow is now a multiplier on top of the material_flow 
that's because we should override the per-feature flow settings with one global material_flow_layer_0 setting to rule them all.
The flow per feature is more accurate to these features, so the initial layer should expand all these seaprately.
 2018-10-17 14:11:58 +02:00
Tim Kuipers
d5db639c45 move prime_tower_flow to rest of flow settings 2018-10-17 14:11:58 +02:00
Tim Kuipers
3d1ad32c57 feat: feature dependent flow settings 2018-10-17 14:11:58 +02:00
Tim Kuipers
c5371e19cc fix: initial layer line width factor is not a specialization of the line width any more 
They are not even in the same unit, so it cannot be a child.
A parent setting should be exactly equal to all child settings combined.
 2018-10-17 14:11:58 +02:00
Jaime van Kessel
45da5b9130 Added more specific overrides for get/set globalContainerStack 
This helps a lot with the type hinting in other bits of the code, since for CuraApplicaiton we know it's always going to be a GlobalStack

CURA-5814
 2018-10-17 14:07:12 +02:00
Jaime van Kessel
ccb0d63041 Rename print_time_message_values to something print_times_per_feature 
Since this actually makes sense and describes what it holds. CURA-5814
 2018-10-17 13:50:52 +02:00
Jaime van Kessel
440dee2191 Removed unused code 
CURA-5814
 2018-10-17 13:32:26 +02:00
Jaime van Kessel
3fd9d35ea4 Removed outdated documentation 
CURA-5814
 2018-10-17 13:31:58 +02:00
Jaime van Kessel
6555f4d4f3 Add typing 
Because of boyscouting. CURA-5814
 2018-10-17 13:31:03 +02:00
Diego Prado Gesto
f013450195 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-17 10:52:56 +02:00
Jaime van Kessel
a58c63bbb8 Minor fixes for visibility preset tests 
CURA-5734
 2018-10-17 10:51:47 +02:00
Diego Prado Gesto
e9e95b85e7 Remove support_roof_enable to True in Tevo Black Widow quality profiles, 
since the support interface is already enabled.

Fixes #4587.
 2018-10-17 10:51:28 +02:00
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Jaime van Kessel
d086e6fa86 Fix review comments 
CURA-5734
 2018-10-17 10:47:34 +02:00
Jaime van Kessel
304a9e11f3 Moved view selection back into Cura QML 
It didn't make a whole lot of sense for it to be a seperate component, since it's probably going to change in the future

CURA-5772
 2018-10-17 09:50:24 +02:00
alekseisasin
a7be605b9d Typing error in CI CURA-5769 2018-10-17 09:50:22 +02:00
Aleksei S
24805b3883 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-16 16:48:24 +02:00
Aleksei S
20fa7f4dd8 Display retractions lines for the loaded Gcode files 
CURA-5769
 2018-10-16 16:47:05 +02:00
Remco Burema
25000e8a6b Fix typo's. [CURA-5760] Feature support brim. 2018-10-16 16:10:30 +02:00
Remco Burema
58490343f7
Merge pull request #4363 from BagelOrb/feat_support_brim 
Feat: support brim
 2018-10-16 16:07:33 +02:00
Vlad Gribinchuk
5d41d2cc3d JSON setting for "Nozzle Switch Extra Prime Distance" feature 2018-10-16 14:40:21 +03:00
Diego Prado Gesto
4a0808378b Allow whitespaces in the job name. 
Fixes #4530.
 2018-10-16 13:23:35 +02:00
Jaime van Kessel
6eb8b75490 Update typing and fixed the bug it exposes. 2018-10-16 11:31:33 +02:00
Ian Paschal
b99bc06d1c Clean up more errors 
Contributes to CL-1051
 2018-10-16 09:34:50 +02:00
Ian Paschal
1fa7a8880b Clean up some QML warnings 
Contributes to CL-1051
 2018-10-15 17:02:27 +02:00
Ghostkeeper
b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
 2018-10-15 16:52:22 +02:00
Jaime van Kessel
553e29b9b8 Fix QML warnings 
CURA-5772
 2018-10-15 15:42:17 +02:00
Ghostkeeper
c680050040
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-15 15:41:17 +02:00
Ghostkeeper
95f89044c0
Merge branch 'CURA-5483_add_s5_to_firmware_checker' 2018-10-15 15:25:29 +02:00
Jaime van Kessel
2455961ac7 Vertically allign the toolbar 
CURA-5772
 2018-10-15 15:16:28 +02:00
Jaime van Kessel
cd5a0a84a8 Horizontally align the prepare menu bar 
CURA-5772
 2018-10-15 15:14:05 +02:00
Ghostkeeper
53dc28db89
Change URL of firmware update page for Ultimaker 3 and S5 
I just got word of a new page to read up about the firmware update. Apparently we now have to link to this one.

Contributes to issue CURA-5483.
 2018-10-15 15:12:42 +02:00
Jaime van Kessel
1c70a62df6 Fix typo 
Derp. CURA-5772
 2018-10-15 15:10:50 +02:00
Jaime van Kessel
a7edd893d7 Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn. 
This will ensure that if a stage sets a mainComponent that it won't have any other items drawn over it.

CURA-5772
 2018-10-15 15:08:58 +02:00
Jaime van Kessel
a473a46a35 Add a bit more documentation to explain what the elements do 
CURA-5772
 2018-10-15 15:07:46 +02:00
Ghostkeeper
56a383814b
Code style: Spaces around binary operators 
Contributes to issue CURA-5483.
 2018-10-15 14:48:18 +02:00
Jaime van Kessel
1e3a9ff57c Removed the expandSidebar action 
Since we don't even have a sidebar anymore, there is no point in expanding it.
 2018-10-15 14:23:42 +02:00
Jaime van Kessel
4e432a5f06 Remove SidebarHeader 
It has been replaced by others, so we don't need it anymore

CURA-5772
 2018-10-15 14:21:03 +02:00
Jaime van Kessel
f6ae19003b The AccountDetails Panel is now an actual popup 
This ensures that it's always visible (previously it was ocluded by the StageMenu)

CURA-5772
 2018-10-15 14:07:30 +02:00
Jaime van Kessel
62c9980438 Move SidebarTooltip so that it's no longer ocluded by other objects 
CURA-5772
 2018-10-15 14:07:01 +02:00