3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
18800 commits 302 branches 270 tags 773 MiB
Commit graph

18800 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Ghostkeeper
f32aadf39c
Merge branch '3.5' 2018-10-15 14:00:59 +02:00
Ghostkeeper
d7a7cf3003
Correct some printers to use 1.75mm filament 
This should fix some underextrusion problems... Hmm.

Sources:
* https://alya3dp.com/pages/teknik-ozellikler
* https://www.creality3d.cn/creality-cr-10-s4-3d-printer-p00098p1.html
* https://www.creality3d.cn/creality-cr-10-s5-3d-printer-p00099p1.html
* https://3dprint.com/3643/german-repraps-neo-3d-printer-now-available-in-the-us-uk/
* https://somosmaker.com/pegasus-impresora-3d/
* http://www.3dmaker.vn/3d-printer-3dmaker-starter/?lang=en# (assuming the filaments they sell on that website are compatible)
* https://makezine.com/product-review/printrbot-play/

I could not find a source for the Deltabot, but got that information from here: https://github.com/Ultimaker/Cura/issues/4573

Contributes to issue CURA-5817.
 2018-10-15 14:00:47 +02:00
Ghostkeeper
02efd7a1f5
Correct some printers to use 1.75mm filament 
This should fix some underextrusion problems... Hmm.

Sources:
* https://alya3dp.com/pages/teknik-ozellikler
* https://www.creality3d.cn/creality-cr-10-s4-3d-printer-p00098p1.html
* https://www.creality3d.cn/creality-cr-10-s5-3d-printer-p00099p1.html
* https://3dprint.com/3643/german-repraps-neo-3d-printer-now-available-in-the-us-uk/
* https://somosmaker.com/pegasus-impresora-3d/
* http://www.3dmaker.vn/3d-printer-3dmaker-starter/?lang=en# (assuming the filaments they sell on that website are compatible)
* https://makezine.com/product-review/printrbot-play/

I could not find a source for the Deltabot, but got that information from here: https://github.com/Ultimaker/Cura/issues/4573

Contributes to issue CURA-5817.
 2018-10-15 13:55:47 +02:00
Jaime van Kessel
0a1dad92ea Change AvatarImage so it uses aliases instead of properties 
I've changed this because it makes for much cleaner QML

CURA-5772
 2018-10-15 13:41:44 +02:00
Jaime van Kessel
167c6fbb76 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-15 11:47:45 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings 
CURA-5772
 2018-10-15 11:07:03 +02:00
Jaime van Kessel
8cac5e1de2 Removed the components qml dir 
We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.

CURA-5772
 2018-10-15 10:34:19 +02:00
Jaime van Kessel
fc1faf79f5 Cleanup unused code 
CURA-5772
 2018-10-15 09:52:48 +02:00
Jaime van Kessel
2fce1e433a Fix the tooltips for time estimations 
CURA-5772
 2018-10-15 09:49:08 +02:00
Lipu Fei
73de720947 Change material diameter to 1.75 for monoprice machines 
CURA-5817
 2018-10-15 09:27:55 +02:00
Ghostkeeper
e747219bbe
Let Makerbot Replicator use Replicator's X3G variant 2018-10-15 01:30:36 +02:00
Remco Burema
2e3abbc904 Put the firmware-update meta-data in the 'normal' printer definitions and make the code handle that. 2018-10-13 21:55:33 +02:00
Remco Burema
931143ceaa Added FirmwareUpdateCheckerMessage, so no variables have to be hidden in the action of a plain Message. 2018-10-13 20:05:20 +02:00
Remco Burema
8c71a8855c FirmwareUpdateChecker: Remove superfluous 'version_parser' as a setting, since it broke lean principles. 2018-10-13 19:36:11 +02:00
Remco Burema
60408c14bc FirmwareUpdateChecker: Small refactors due to code review. 2018-10-13 19:21:22 +02:00
Ghostkeeper
6cf2e89f6b
Document CameraImageProvider 
Makes it easier than looking up the Qt documentation online.
 2018-10-13 16:40:26 +02:00
Ghostkeeper
1b7055f0f3
Fix spelling of error message 
Loopup -> Lookup.

Contributes to issue CURA-5483.
 2018-10-12 17:03:48 +02:00
Ghostkeeper
e3b05f0867
Code style: Spaces around binary operators 
Also removed the unused machines_json value.

Contributes to issue CURA-5483.
 2018-10-12 16:46:39 +02:00
Ghostkeeper
6ac10db582
Code style: Use double quotes for strings 
Contributes to issue CURA-5483.
 2018-10-12 15:37:43 +02:00
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed 
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
 2018-10-12 14:56:27 +02:00
Ghostkeeper
99fc372b32
Update printer information when switching global container stacks 
This was just evaluated once during the creating of a USB connection. But you can switch out the printer without breaking/making a USB connection, so in that case we have to update it here.

Contributes to issue CURA-5749.
 2018-10-12 14:55:13 +02:00
Jaime van Kessel
11a08d0e47 Move whole bunch of QML components to their new locations 
The tooltips are still not working correctly, it might be that it needs rework

CURA-5772
 2018-10-12 13:32:23 +02:00
Jaime van Kessel
7d5472b09f Moved the prepareMenu into the prepare stage plugin 
CURA-5772
 2018-10-12 13:29:57 +02:00
Jaime van Kessel
10de312647 Added QMLDIR so we can specify cura specific QML components for plugins 
This ensures that we can be way more explicit with what QML components we see as re-usable

CURA-5772
 2018-10-12 13:28:08 +02:00
Jaime van Kessel
6ea03d27a4 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-12 13:26:53 +02:00
Ghostkeeper
287689a073
Don't cache the automatic firmware name 
The QML property was not updated when you change the printer. By not caching it, it gets the current printer's firmware file upon clicking the button. Simple and effective, and not that tough on computational power that it needs caching.

Contributes to issue CURA-5749.
 2018-10-12 13:25:34 +02:00