GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,753 Commits 290 Branches 260 Tags
Commit Graph

1341 Commits

Author SHA1 Message Date
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Jaime van Kessel
729d78e14a Updated another set of typing 2018-09-10 16:08:31 +02:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Jaime van Kessel
67bc45e37d Added 3MF writer as required plugin 2018-09-10 09:40:53 +02:00
Ian Paschal
9e56d6d29f Improved expansion behavior 
Contributes to CURA-5682

- Active material is now expanded by default when opening the manager

- Expanded and collapsed sections are saved to preferences

- Sections are now highlighted when collapsed and having a selected material inside

- Bug with losing focus between fields is not yet fixed
 2018-09-05 17:16:06 +02:00
Jaime van Kessel
49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-30 10:35:20 +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
8da7773600 Remove unused code 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:04:51 +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
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
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
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests 
Fix unit tests
 2018-08-20 10:32:38 +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
f42dc24d95 Do not show gcode.gz as an option in save file dialog 
CURA-5649
 2018-08-16 15:16:32 +02:00
Jaime van Kessel
28dc918e03 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-16 13:28:57 +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
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
Diego Prado Gesto
ebb0317276 Merge branch 'master' into fix_unit_tests 2018-08-14 17:23:23 +02:00
Diego Prado Gesto
ce9782b3af Initialize the empty_container in CuraApplication. 
Contributes to CURA-5628.
 2018-08-14 15:32:04 +02:00
Jaime van Kessel
94b9782110 Added preview image to print cluster monitor 
CL-894
 2018-08-14 14:54:27 +02:00
Jaime van Kessel
78ebdb13f4 Cluster monitor page now shows queue instead of added printers 
CL-894
 2018-08-14 13:34:05 +02:00
Diego Prado Gesto
c8af4f45ce Decouple the creation of the stack containers from the process that add 
them to the container registry, that is done in CuraApplication.

That allow us to have access to the empty containers and so we can unit
test easily without mocking up stuff.

Contributes to CURA-5628.
 2018-08-14 13:25:56 +02:00
Lipu Fei
5869644b0b Fix typo 2018-08-14 12:02:11 +02:00
Ian Paschal
f91254c7c0 Fix typo in comment 2018-08-13 15:27:01 +02:00
Diego Prado Gesto
152005ab14
Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension 
CURA-5570 More decision points in material and quality lookup!
 2018-08-13 12:06:29 +02:00
Diego Prado Gesto
b1c073aab6 CURA-5570 Expose the CuraSDKVersion to qml and show the buildplate 
selector only when "dev" version is selected.
 2018-08-13 11:50:50 +02:00
Ian Paschal
3fad11e07f Code style fixes 
Contributes to CURA-5595
 2018-08-13 10:45:03 +02:00
Aleksei S
a1bc2f3ebf Merge branch 'master' into CURA-5595_add_custom_button_to_menu 2018-08-10 15:51:38 +02:00
Lipu Fei
387fb3ce1f Fix missing attribute 
CURA-5622

self._plugins_loaded should be there in the beginning or Cura will crash
when it gets used.
 2018-08-08 11:47:14 +02:00
Jack Ha
1e2c590c54 In multi build plate mode objects are now always arranged instead of never. CURA-5606 2018-07-31 09:50:43 +02:00
Aleksei S
40c51249f5 Merge branch 'custom_menuitems_in_sidebar' into CURA-5595_add_custom_button_to_menu 2018-07-26 13:51:07 +02:00
Lipu Fei
1f15599b4d Fix non-slicable check 
CURA-5465
 2018-07-24 15:53:57 +02:00
Ian Paschal
320d73c6e5 Retain 3MF mesh positions 
Contributes to CURA-5465

Fixed bug by preventing read jobs for 3mf files from being auto-arranged.

Boyscout changes:
- Fixed typo in `ThreeMFReader.py` (`splitted` → `split`)
- Fixed code style in `CuraApplication.py` (`filename` → `file_name`)
 2018-07-24 12:17:53 +02:00
Diego Prado Gesto
01a26b0360 CURA-5572 The scene was not updated when a Gcode was loaded. 
This fixes a bug that we introduced when fixing code style. This was a
bad translation.
 2018-07-13 16:05:13 +02:00
alekseisasin
31891e631c
Merge pull request #4070 from Ultimaker/CURA-5384_confirm_upon_exit 
CURA-5384 confirm upon exit
 2018-07-13 11:54:14 +02:00
Ghostkeeper
302072bd6e
Set change log URL in Cura instead of Uranium 
This is a Cura-specific URL that was in Uranium.

Contributes to issue CURA-4952.
 2018-07-13 09:46:08 +02:00
Lipu Fei
c0b7e40b0d Add on-exit callback management and check for active USB printing 
CURA-5384
 2018-07-13 09:16:11 +02:00
Lipu Fei
ac3d3bc5c0 Revert "Added signal to prevent window closing if USB printer is printing" 
This reverts commit 596a7b7169b9c7e41cd4751f99eea656f67ed2b7.
 2018-07-13 08:08:56 +02:00
jack
461b191648
Merge pull request #4044 from Ultimaker/remove-package-check 
CURA-5389 Check and confirmation before Remove package
 2018-07-12 14:15:13 +02:00
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing 
CURA-5384
 2018-07-11 13:23:30 +02:00
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
Lipu Fei
e87f3d7ca9 Fix plugins import in CuraApplication 
CURA-5543

Only import types for type checking when TYPE_CHECKING is true.
 2018-07-05 10:23:20 +02:00
Ghostkeeper
4f1b2d51cc
Remove old commented code 
This is not valid any more by a long shot.
 2018-07-05 09:45:20 +02:00
Diego Prado Gesto
f91b6faecc Fix code-styling 2018-07-03 17:57:30 +02:00
Diego Prado Gesto
762a1b1bfd Fix code-style 2018-07-03 12:06:06 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes 2018-06-29 13:45:55 +02:00