Commit graph

17030 commits

Author SHA1 Message Date
Lipu Fei
8582a1ba1a Mock application in unit tests 2018-08-23 17:00:57 +02:00
Ian Paschal
6be9b5e27f Consolidate models some more
Contributes to CURA-5162, CURA-5378
2018-08-23 16:58:23 +02:00
Ian Paschal
56a5f59964 Cleaner code
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
2018-08-23 16:39:40 +02:00
Ian Paschal
8da7773600 Remove unused code
Contributes to CURA-5162, CURA-5378
2018-08-23 16:04:51 +02:00
Jaime van Kessel
b0d9dc6fdd Added DropShadow to the printer & printjob tiles
CL-893 && CL-894
2018-08-23 15:53:32 +02:00
Jaime van Kessel
5176ead0e2 Added print progress to sidebar
CL-893
2018-08-23 15:07:31 +02:00
Jaime van Kessel
8c2cd510d8 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-23 12:45:41 +02:00
Ghostkeeper
06525bed4b
Merge branch 'master' into refactor_singleton_settingsbase
Resolved a conflict in CuraEngineBackend due to refactor removing JSON from the command while master added optional verbose mode in debug mode.

Contributes to issue CURA-4410.
2018-08-22 17:04:55 +02:00
Ghostkeeper
49e3c23d14
Brackets on new line
As per our code style.
2018-08-22 16:53:27 +02:00
alekseisasin
0d293ddced
Merge pull request #4251 from Ultimaker/CURA-5645_no_write_gcode_to_recent_files
CURA-5645 Do not add saved gcodes to recent files list
2018-08-22 16:28:58 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view
Contributes to CURA-5378
2018-08-22 15:58:58 +02:00
fieldOfView
7b00d6879a Factor out USBPrinterManager singleton 2018-08-22 15:44:11 +02:00
fieldOfView
5f81c6d1f4 Add a FirmwareUpdater class and make AvrFirmwareUpdater a subclass 2018-08-22 15:43:17 +02:00
fieldOfView
4bea1410b8 Allow printer output devices to set their ability to update firmware 2018-08-22 14:37:48 +02:00
alekseisasin
ff38ee2bed
Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog
CURA-5649 Do not show gcode.gz as an option in save file dialog
2018-08-22 14:12:08 +02:00
Thomas Kriechbaumer
afb4440d64 add PauseAtHeight post-processing script for RRF 2018-08-22 13:46:49 +02:00
Lipu Fei
29180740de Fix missed names 2018-08-22 13:36:17 +02:00
Lipu Fei
94ce9205c3 Remove pytest cache 2018-08-22 13:30:59 +02:00
Ian Paschal
00eb8e6788 Organize material preferences
Contributes to CURA-5378
2018-08-22 12:34:38 +02:00
Ian Paschal
272e892179 Extend Cura Light theme for material favorites
Contributes to CURA-5162, CURA-5378
2018-08-22 12:33:55 +02:00
Ian Paschal
cb713eea6a Improve models
Contributes to CURA-5162, CURA-5378
2018-08-22 12:33:29 +02:00
Ian Paschal
08b325ee04 Correctly load material favorites from preferences
Contributes to CURA-5378, CURA-5162
2018-08-22 12:31:48 +02:00
fieldOfView
c1d7ca7bff Merge branch 'master' into feature_firmware_updater 2018-08-22 12:16:25 +02:00
Mark Burton
a0787a03ea Added extruder setting field for cooling fan number. 2018-08-21 19:45:35 +01:00
Mark Burton
b9f1f8c400 Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder. 2018-08-21 19:44:21 +01:00
Lipu Fei
af64d91587 Fix stack handling in project loading
CURA-5663
2018-08-21 16:07:17 +02:00
Jaime van Kessel
5a13b86a3f Changed style for context button
CL-894
2018-08-21 14:55:18 +02:00
Cherubim
f35005c8ba
Brackets on new line
As per our code style.
2018-08-21 14:24:07 +02:00
Jaime van Kessel
dc85568973 Printer tiles in sidepanel can now be collapsed even if no job is active
CL-893
2018-08-21 13:52:09 +02:00
Lipu Fei
10e474ad27 Add draft shield distance into the prime tower position fomulas
CURA-5644
2018-08-21 13:38:56 +02:00
Jaime van Kessel
6a08b63f21 Ensure that extruder configurations are correctly sorted
CL-894
2018-08-21 13:32:22 +02:00
Aleksei S
4635c8117d Add changed_settings(retraction_combing) to Version Upgrade Cura3.4
CURA-5505
2018-08-21 11:49:13 +02:00
Remco Burema
ca25638c07 .ufp should also not show up in recent files since it's a gcode format 2018-08-21 11:01:35 +02:00
Jaime van Kessel
03a7833180 Fixed qml warnings (reading from undefined properties)
CL-893 && CL-894
2018-08-21 10:14:12 +02:00
Ian Paschal
6d1fd8281c Add favorites funcitonality to MaterialManager.py
Contributes to CURA-5378
2018-08-20 17:17:14 +02:00
Ian Paschal
68bccd8bf7 Improve the Favorites, Base, and Brand materials models (WIP)
Contribuetes to CURA-5378
2018-08-20 17:16:54 +02:00
Ian Paschal
2410c21839 Move material list to separate QML file
Contributes to CURA-5378
2018-08-20 17:16:05 +02:00
paukstelis
fc9c1045c9 Basic cleanup 2018-08-20 07:40:28 -04:00
Lipu Fei
1468ac1d59 Check if dict has key before accessing in BuildVolume 2018-08-20 13:20:52 +02:00
alekseisasin
4b5cc59508
Merge pull request #4144 from smartavionics/mb-add-combing-mode-within-infill
Added the "Within Infill" combing option that functions identically to the original "Not in Skin" option.
2018-08-20 12:50:41 +02:00
Lipu Fei
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests
Fix unit tests
2018-08-20 10:32:38 +02:00
paukstelis
b66558f97a Initial commit for passing mesh names to CuraEngine 2018-08-19 22:52:17 -04:00
Jaime van Kessel
1fa3b60f94 Added rough outline of the redesigned cluster controlItem
CL-893
2018-08-17 16:10:23 +02:00
Jaime van Kessel
b074d2bdf3 Added translations for the strings
CL-894
2018-08-17 13:41:23 +02:00
Ghostkeeper
6740c2bee9
Fix offset of initial layer height
It would detect the height of the raft by looking at what the first Z coordinate is that it encounters on layer 0. This Z coordinate also includes the initial layer height though. If you pause lower than the initial layer height (but higher than 0), you'd expect to pause in the initial layer.
2018-08-17 11:24:39 +02:00
Ghostkeeper
9f190590b1
Only change camera range if camera range is valid
This was a debugging test to see if this fixed an issue. It turned out to not be the issue in question, but this is still a defensive coding thing that would be good to have.
2018-08-17 10:56:46 +02:00
Ghostkeeper
284f90f3ff
Fix camera position before adding a printer
Don't use the diagonal size then, because that returns 0.
2018-08-17 10:56:46 +02:00
Lipu Fei
1079a9be2c Do not add saved gcodes to recent files list 2018-08-17 10:53:30 +02:00
Jaime van Kessel
eb7d42a7f8 Added delete button to cluster queue
CL-894
2018-08-17 10:49:44 +02:00
Jaime van Kessel
db1d90ed9b Added delete function
This is needed at a later stage to delete print jobs from queue by the cluster

CL-894
2018-08-17 10:38:46 +02:00