GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 11:53:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 290 Branches 260 Tags
Commit Graph

1219 Commits

Author SHA1 Message Date
Lipu Fei
afa3e62dc1
Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown 
CURA-5814 material cost now always shown
 2018-10-19 11:20:29 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Lipu Fei
e5efd1e41f Move constant definition into constructor 
CURA-5812
 2018-10-19 09:57:57 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +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
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
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
Diego Prado Gesto
193f113851 Clean up Cura.qml: 
- Create a Skeleton folder where the main parts of the application will
be stored.
- Separate the top menus to a different file.

Contributes to CURA-5784.
 2018-10-08 10:33:01 +02:00
Lipu Fei
18cb21186c Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 2018-10-03 15:45:18 +02:00
Jaime van Kessel
f3fdb46dba Add missing types 2018-10-03 13:33:30 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Jaime van Kessel
edb5de9954 Added unit test for settingvisibility presets 
CURA-5734
 2018-10-01 14:50:53 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +02:00
Lipu Fei
f69005fef9 Rename to CuraFormulaFunctions 
to avoid confusion with "SettingFunction" in Uranium.
 2018-10-01 11:24:34 +02:00
Lipu Fei
8584af415a Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth 2018-09-28 14:32:16 +02:00
Lipu Fei
7ae6800a14 Fix imports in QualityManager 2018-09-28 14:01:28 +02:00
Lipu Fei
dd150bbab9 Resolve circular imports for CuraAPI 2018-09-28 12:07:00 +02:00
Jaime van Kessel
3b70e5eb6b Fix typing 
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
 2018-09-27 20:01:55 +02:00
ChrisTerBeke
185a1707b2 Merge branch 'master' into CURA-5744-move-oauth-login 2018-09-27 09:40:44 +02:00
Lipu Fei
7a681a2ae4 Move Cura custom setting functions to a separate file 2018-09-26 16:54:00 +02:00
Cherubim
c29d38361b
Fix initial start-up when providing model parameter 
If you're adding a model file as command line argument to Cura, it should auto-load this file upon start-up. However when adding this command line argument upon first launch of Cura, there is no printer yet so Cura would crash because it tries to load a model before there is a build volume. This prevents that crash and instead doesn't load the model at all.
 2018-09-23 00:27:50 +02:00
Jaime van Kessel
081b2a28fe Expose Account API to QML 
This is done by adding the API as an SingletonType to Cura.

CURA-5744
 2018-09-21 17:23:30 +02:00
Lipu Fei
a80fde1495 Merge remote-tracking branch 'origin/3.5' 2018-09-21 12:11:18 +02:00
Lipu Fei
1bf78c086d Remove import plugins which is not a module 2018-09-21 12:03:15 +02:00
Diego Prado Gesto
8352fd1ae0 Merge branch '3.5' 2018-09-21 09:29:17 +02:00
Diego Prado Gesto
4bd5d29970 Don't crash if the plugin is not found (maybe some error while loading). 
In that case it's better not to show the dialog than crashing.
 2018-09-20 18:41:30 +02:00
Diego Prado Gesto
2d300ab395 Revert "Fix plugins import in CuraApplication" 
This reverts commit e87f3d7ca9cf135142bee488f188b9639c8b38fd.
 2018-09-20 18:34:08 +02:00
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