GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 19:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,122 Commits 290 Branches 260 Tags
Commit Graph

25122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remco Burema
0ba3833995
Merge pull request #9153 from Ultimaker/CURA-7865_Save_file_in_existing_project_mvp 
CURA-7865 Save file in existing project mvp
 2021-01-20 19:18:39 +01:00
Kostas Karmas
32df06c280 Add TODO comment to explain the commenting out of the snapshot 
CURA-7865
 2021-01-20 12:51:13 +01:00
Kostas Karmas
a72a58cca1 Comment out the generation of the snapshot 
While generating UFP files from outside the main thread, the snapshot generation crashes Cura
due to the OpenGL context.

To avoid that, for the time being, we comment out the generation of the snapshot.

CURA-7865
 2021-01-20 11:23:48 +01:00
Kostas Karmas
b7e613a271 Remove file_type argument from the saveWorkspaceDialog 
Because we also want to export ufp files, which are not workspace files.

CURA-7865
 2021-01-19 21:39:16 +01:00
Ghostkeeper
4380cdbd86
Don't crash on malformed JSON structures 
JSON dictionaries need to have a certain structure such as strings as keys. If that's not correct it gives a TypeError. Don't crash on those; give a similar error message as when the values in the JSON are invalid.
 2021-01-19 16:31:31 +01:00
Ghostkeeper
a9c8c63442
Catch environment errors removing temporary package files 
Could be removed or not having access rights.

Fixes Sentry issue CURA-1K6.
 2021-01-19 14:49:47 +01:00
Ghostkeeper
1b8463ba30
Catch TypeError when parsing setting version 
Someone had a list in the setting version, which then crashed Cura.
 2021-01-19 14:09:46 +01:00
fieldOfView
d790de8706 Fix loading scripts from all registered resource paths 2021-01-19 13:55:02 +01:00
Ghostkeeper
640e038ce7
Catch OSError when authorizing connection 
Fixes Sentry issue CURA-1GW.
 2021-01-19 11:05:55 +01:00
Jaime van Kessel
888abdac33
Merge branch 'master' of github.com:Ultimaker/Cura 2021-01-19 09:48:51 +01:00
Ghostkeeper
0a7dc34a9c
Update start g-code for BIBO2 Dual 
This is a correction supplied by braden0202 in the issue thread #8977.
 2021-01-18 18:52:01 +01:00
Kostas Karmas
f1e152955c Correct the Menu title 
CURA-7865
 2021-01-18 18:00:05 +01:00
Jaime van Kessel
ffccd687ac
Merge branch 'fix_machinesettings_floats' of https://github.com/fieldOfView/Cura 2021-01-18 15:53:57 +01:00
Jelle Spijker
8d4996f60b
Merge pull request #9141 from maihde/feature_snapmaker_definitions 
feat: add snapmaker 2.0 definitions
 2021-01-18 14:58:44 +01:00
maihde
770dcd1cf0 feat: add snapmaker 2.0 definitions 2021-01-18 07:57:07 -05:00
Jelle Spijker
9e60f6d23b
Merge pull request #9128 from Ultimaker/CURA-7855_Drop_objects_to_buildplate_after_scale 
Drop objects to buildplate that have been scaled
 2021-01-18 12:32:12 +01:00
Kostas Karmas
fc718892d9 Add default text in the ComboBox 
The Cura.ComboBox component can now display a default text when there are no items in its model
and another text when there is no item selected.

CURA-7865
 2021-01-18 12:10:15 +01:00
Kostas Karmas
2774ec7bdf Remove unnecessary kwargs 
CURA-7865
 2021-01-15 17:42:42 +01:00
Jaime van Kessel
bc15ca2269
Merge branch 'fix_pause_at_height_default_value' of https://github.com/fieldOfView/Cura 2021-01-15 17:10:23 +01:00
Jaime van Kessel
828ddd2b7f
Merge branch 'adapt-to-python-3.9-api-changes' of https://github.com/lorenzph/Cura 2021-01-15 15:26:51 +01:00
Jaime van Kessel
5d9affc690
Drop objects to buildplate that have been scaled 
Otherwise they could be floating very high above the buildplate.

CURA-7855
 2021-01-15 15:21:57 +01:00
Kostas Karmas
a45af1da25 Add save projects submenu 
CURA-7866
 2021-01-15 09:50:23 +01:00
Ghostkeeper
263e1ae3a7
Show 'connect top/bottom polygons' also when initial layer bottom pattern is concentric 
Fixes CURA-7962.
Fixes #9106.
 2021-01-12 11:39:50 +01:00
Konstantinos Karmas
0edd6278f8
Merge pull request #9089 from Ultimaker/CURA-7864_open_remote_files_mvp 
Open remote files MVP
 2021-01-12 11:04:29 +01:00
Kostas Karmas
b3e8f4d0e6 Merge branch 'CURA-7868_Introduce_file_provider_plugin_type' into CURA-7864_open_remote_files_mvp 2021-01-12 10:53:32 +01:00
Jelle Spijker
d16c5f1991
Merge pull request #9012 from Ultimaker/CURA-7868_Introduce_file_provider_plugin_type 
CURA-7868: Introduce the file provider plugin type
 2021-01-11 18:24:18 +01:00
Kostas Karmas
fd3c985440 Fix ambiguous Ctrl+O shortcut not opening the local file dialog 
Ctrl+O was assigned as a shortcut in two places:
  1. To the "File->Open File(s)" menu item, which is visible when only the local file
	 provider is enabled (i.e. the DF file provider is disabled)
  2. To the "File->Open File(s)->From Disk" menu item, which is visible when there are
     more than one file providers enabled.

This was creating an ambiguous shortcut, thus never opening the local file dialog.

This is now fixed by disabling the shortcuts when the respective items are not visible.

CURA-7868
 2021-01-11 17:50:26 +01:00
Kostas Karmas
3282ad7a41 Don't add temporary files in the recent files list if F5 is pressed 
CURA-7864
 2021-01-11 12:52:23 +01:00
skilescm
8ce0dbe9cc
Added Maker Made 300x Printer (#8901) 
* Add files via upload

* Add files via upload

* Update maker_made_300x.def.json

* Update maker_made_300x_extruder_0.json

* Update maker_made_300x_extruder_0.json

* Update maker_made_300x.def.json

* Update maker_made_300x.def.json

* Update maker_made_300x.def.json

* Update resources/extruders/maker_made_300x_extruder_0.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/maker_made_300x.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/maker_made_300x.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update maker_made_300x.def.json

* Rename maker_made_300x_extruder_0.json to maker_made_300x_extruder_0.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-01-11 09:15:17 +01:00
cataclism
a2e5ce6680
Adding the MINGDA D2 (#8872) 
* Added the configuration files for the Artillery Printers

Added the configuration files for the Artillery Printers

* Changed version file

* Updated versions, removed machine_head_polygon

* fixed version in some files

* Added generic PLA,PETG,ABS,TPU

* Update resources/definitions/artillery_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/artillery_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* 1st batch of update

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* 2nd batch of changes

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Added the MINDA definition and the MINGDA D2

* Update mingda_d2.def.json

Inserted artillery genius plate for the moment

* Update mingda_d2.def.json

Updated machine dimension

* Added the mesh for the D2 & updated the offsets

* Update resources/definitions/mingda_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-01-11 09:07:35 +01:00
Philip Lorenz
352fef3efa Adapt to Python 3.9 API changes 
Python 3.9 now made the TreeBuilder.start() `attrs` parameter ([1])
mandatory on all implementations. Adapt the plugin accordingly.

[1] https://bugs.python.org/issue39495
 2021-01-10 20:21:40 +01:00
Konstantinos Karmas
9562dc01f4
Merge pull request #8718 from Ultimaker/speed_up_container_tree 
Simplify and speed up the extending of the qualities list
 2021-01-08 16:00:52 +01:00
Ghostkeeper
faee42a94e
Merge branch 'bugfix_typo_their' of https://github.com/timgates42/Cura into timgates42-bugfix_typo_their 2021-01-08 15:24:23 +01:00
Konstantinos Karmas
7574b3e2c7
Merge pull request #8924 from Eryone/master 
Added Eryone ER20 3d printer
 2021-01-08 14:00:23 +01:00
Remco Burema
13d45e3a55
Typing typo. 
CURA-7864
 2021-01-08 13:51:03 +01:00
Remco Burema
aa0a08500e
Temproray files shouldn't be in recent file list. 
CURA-7864
 2021-01-08 13:44:23 +01:00
Kostas Karmas
96c4d66029 Revert making the open file dialog a separate LocalFileProvider plugin 
This reverts commits 00de7497a4c2986cf8fd13be8f598a0f615f3d63 to 5f6b3b52c1848416c98f7d276fe02f08d067f675

CURA-7868
 2021-01-07 16:35:40 +01:00
Ghostkeeper
0788df4797
Add log entry upon exporting container 
Quite a salient moment in the log. According to our log levels definitions this must be info since it's the direct result of a user interaction.
 2021-01-06 14:11:15 +01:00
Kostas Karmas
606ec587fe Change the row height in the table view 
CURA-7868
 2021-01-06 11:51:29 +01:00
Kostas Karmas
adcdf7bad9 Remove unnecessary QML imports 
CURA-7868
 2021-01-05 14:54:28 +01:00
Kostas Karmas
dc02038513 Add a Cura-themed, re-usable TableView component 
CURA-7868
 2021-01-05 14:47:46 +01:00
Ghostkeeper
5f6b3b52c1
Don't trigger open menu upon starting Cura 
That would be very annoying.

Contributes to issue CURA-7868.
 2021-01-04 18:13:18 +01:00
Ghostkeeper
b266904d76
Replace other references to the open action with the file provider model 
This adds a function 'triggerFirst' to the file provider that triggers the first file provider in the model. That should then be the local file provider, but if the plug-in is disabled for some reason it would use another plug-in.

Contributes to issue CURA-7868.
 2021-01-04 18:12:15 +01:00
Ghostkeeper
de80461954
Remove open action, fixing ambiguous overload of Ctrl+O 
The action was no longer in the menu, but the hotkey still functioned. Then there were two actions for Ctrl+O, which was ambiguous to Qt.

Contributes to issue CURA-7868.
 2021-01-04 18:11:00 +01:00
Ghostkeeper
00de7497a4
Move open dialogue to separate file provider plug-in 
We can now define plug-ins that specify where to open files from. This is one of the places where you can open files.
This breaks the main button to open files in the interface. It needs to be redirected to trigger the plug-in to show the open file dialogue.

Contributest o issue CURA-7868.
 2021-01-04 18:11:00 +01:00
Ghostkeeper
4b375ce2fe
Remove unused hasMesh signal 
This is logic that shouldn't be in QML anyway. It's not used by anything at this point. Let's remove it.

Contributes to issue CURA-7868.
 2021-01-04 18:11:00 +01:00
Kostas Karmas
e5038ab46d Update year in the copyright comment. 
CURA-7868
 2021-01-04 15:12:53 +01:00
Kostas Karmas
70550594cd Connect the visibility of the components through their properties 
As Ghostkeeper suspected correctly in the review comment https://github.com/Ultimaker/Cura/pull/9012#discussion_r549707433
the binding wasn't working because the model was being retrieved using a function
(CuraApplication.getFileProviderModel()).

Separating this model into a variable allows us to properly bind the "visible" properties of the
menu items with the count property of the model without a problem.

CURA-7868
 2021-01-04 15:07:53 +01:00
HUNIBEST-HyVISION
d797067326 [CUBICON] Add device(Style NEO-A31) & Update start gcode. 2021-01-04 14:03:42 +09:00
fieldOfView
47723e9823 Fix definition of machine_gcode_flavor setting in PauseAtHeight 2021-01-03 13:22:51 +01:00