Commit graph

15483 commits

Author SHA1 Message Date
Lipu Fei
33f495442a Remove unneeded code
CURA-5162
2018-08-27 10:44:41 +02:00
Ian Paschal
2304aeaceb Expanded states preserved when updating models
Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section.

It's also the ground work for saving material section expansion to preferences.

Contributes to CURA-5378
2018-08-24 12:10:32 +02:00
Ian Paschal
13069a2f99 Some file renaming
Contributes to CURA-5378
2018-08-24 11:06:44 +02:00
Lipu Fei
61c635fbaf Mock application in unit tests 2018-08-24 10:47:01 +02:00
Ian Paschal
93645e6bfe Reduce component sizes
Contributes to CURA-5378
2018-08-24 10:46:23 +02:00
Ian Paschal
f6b43bd9ab Merge branch 'master' into feature_favorite_materials
Contributes to CURA-5162, CURA-5378
2018-08-23 17:24:39 +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
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
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
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
Lipu Fei
af64d91587 Fix stack handling in project loading
CURA-5663
2018-08-21 16:07:17 +02:00
Cherubim
f35005c8ba
Brackets on new line
As per our code style.
2018-08-21 14:24:07 +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
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
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
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
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
Lipu Fei
013032279d Better handling of no quality group in CuraStackBuilder 2018-08-17 10:00:28 +02:00
Ghostkeeper
31e283110f
Check first if preferred quality exists
Fixes #3784.
2018-08-17 09:31:33 +02:00
Lipu Fei
f42dc24d95 Do not show gcode.gz as an option in save file dialog
CURA-5649
2018-08-16 15:16:32 +02:00
Jack Ha
376b6a53c9 Capital Letters In Setting Name. CURA-5623 2018-08-16 13:47:32 +02:00
Jack Ha
f1c8eda532 Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-16 13:45:51 +02:00
Jack Ha
44eb372cb8 Merge branch 'patch-1' 2018-08-16 13:45:33 +02:00
Jack Ha
6c1d380602 Renamed snap_distance to minimum_polygon_circumference and changed the description a bit. CURA-5623 2018-08-16 13:45:27 +02:00
Jaime van Kessel
7a4c9adc3f
Merge pull request #4238 from Ultimaker/CL-980_gcode_preview_not_visible_with_um3
Send UFP to Ultimakers provided the firmware version is sufficient.
2018-08-16 13:11:08 +02:00
Ian Paschal
e8cda90021 Add favorites to materials menu
Contributes to CURA-5162
2018-08-16 13:04:58 +02:00
Ian Paschal
57d41216e1 Remove dummy favorites
Contributes to CURA-5162
2018-08-16 13:04:17 +02:00
Ian Paschal
8493948ba1 Add a favorite materials model
Contributes to CURA-5162
2018-08-15 14:06:07 +02:00
Simon Edwards
e1e9c60016 Send UFP to Ultimakers provided the firmware version is sufficient.
CL-980
2018-08-15 13:56:51 +02:00
Diego Prado Gesto
3d9c7f7eb5
Merge pull request #4216 from Ultimaker/feature_adjust_zoom_to_printer_size
Adjust maximum zoom to printer size
2018-08-15 13:19:46 +02:00
Lipu Fei
c20274e356 Move constant instance containers to a separate file
This way we separate the class/type definitions and the actual
constants.
2018-08-15 11:04:09 +02:00
Ghostkeeper
f1a7b23a5c
Adjust default position of camera based on diagonal size 2018-08-15 09:52:39 +02:00
Ghostkeeper
da39e842f1
Move getting diagonal size out to separate function 2018-08-15 09:25:24 +02:00