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
32,175 Commits 290 Branches 260 Tags
Commit Graph

1342 Commits

Author SHA1 Message Date
Remco Burema
7780d76eb6
Intiial work on 'Singing of Plugins and Material Packages'. 
Most of the work is in Uranium right now -- especially since the plugins part is picked up first, and there are already plugins at Uraniums level.

part of CURA-6856
 2019-10-24 17:31:53 +02:00
Jaime van Kessel
d905b8b8cc
Add extra reporting stage for splash screen 
CURA-6823
 2019-10-24 15:55:49 +02:00
Ghostkeeper
9b836d95d9
Remove quality, variant and material manager 
We don't use them any more and they are deprecated.

Removing them removes a lot of maintenance.

Contributes to issue CURA-6801.
 2019-10-16 13:00:38 +02:00
Lipu Fei
32747d2abe Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-07 21:20:54 +02:00
Nino van Hooff
11d0462c7a Fix recent files python function calls 2019-10-07 10:44:30 +02:00
Nino van Hooff
55fe4ee986 Update documentation and typing 
CURA-6824
 2019-10-02 13:30:59 +02:00
Nino van Hooff
2df0d96923 Consider user preference when opening project files from cli. 
The logic using just a "skip_project_file_check" boolean was too obscure
imho, so used a string value with more explicit values
to improve readability

CURA-6824
 2019-10-01 11:54:53 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
Thomas Karl Pietrowski
f57528ef1a
CuraApplication: Some formatting around messageBox functions 
Just preventing some long lines.
 2019-09-29 21:20:11 +02:00
Nino van Hooff
2c12d713e3 Revert "Do not show the "load project or models" dialog when opening a file from a command line argument" 
This reverts commit abfd7e92, because the desired behavior has still tbd
 2019-09-27 16:50:28 +02:00
Nino van Hooff
abfd7e9266 Do not show the "load project or models" dialog when opening a file from 
a command line argument
 2019-09-27 16:37:41 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property 2019-09-13 17:27:16 +02:00
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-10 15:07:57 +02:00
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Jaime van Kessel
e9862fb348
Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 
CURA-6599
 2019-09-10 10:57:25 +02:00
Lipu Fei
ea8b7ebd02 Fix remove all nodes for loaded gcode 
Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678
 2019-09-09 11:49:25 +02:00
Ghostkeeper
9a6f76c069
Add typing for get---ManagementModel 
Just to have my IDE find usages properly, really.

Contributes to issue CURA-6600.
 2019-09-05 16:32:34 +02:00
Ghostkeeper
1c81174baf
Fix crashing upon creating QualityManagementModel and MaterialManagementModel 
The C++ object should be kept alive in QML.

Contributes to issue CURA-6600.
 2019-09-02 16:47:35 +02:00
Jaime van Kessel
d548404dfd Fix typing issues 2019-08-29 16:23:10 +02:00
Remco Burema
c71660cc11 Fix occasional crash when entering profiles section. 
Make QualityManagementModel into a singleton.
part of CURA-6600
 2019-08-27 16:21:30 +02:00
Ghostkeeper
8346e465f6
Turn MaterialManagementModel into a singleton 
Just like MaterialManager used to be. There can be only one instance of the page then.
This prevents a crash when Qt deletes the QObject because it's no longer used in the page when you close the preferences screen. But when you open it again it doesn't construct a new one. Now there is always one instance so that's not a problem any more. Also it allows other pages to access this item.

Contributes to issue CURA-6600.
 2019-08-27 15:47:41 +02:00
Ghostkeeper
5b8ed91b04
Create new MaterialManagementModel and move canMaterialBeRemoved 
Just like the QualityManagementModel, this class is intended to be used as proxy for the material management page in the preferences. I'm intending to move all relevant pyqtSlots from the material manager into this one. The advantage of this switch is that the material manager had no well-bounded scope and so tended to become a big mess of all sorts of functions. This one has a clear scope: serve as a proxy for the buttons you can press in the preferences screen for materials.

Contributes to issue CURA-6600.
 2019-08-27 15:47:40 +02:00
Lipu Fei
79f11286a6 Fix typing 
CURA-6643
 2019-08-27 14:42:31 +02:00
Lipu Fei
946b2b943e F5 reloads gcode file 
CURA-6643
 2019-08-27 14:42:31 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
 2019-08-13 14:59:05 +02:00
Ghostkeeper
20201c65e6
Merge branch 'master' into feature_intent 
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
 2019-08-13 14:43:28 +02:00
Ghostkeeper
bd714f947a
Register container tree to be built once all metadata is in 
So if we ever change the order of initialisation this stays working.

Contributes to issue CURA-6600.
 2019-08-09 13:40:11 +02:00
Ghostkeeper
e106692165
Make ContainerTree singleton but construct in run() of application 
We want to make sure that this tree is constructed during start-up after all containers have been registered, so we call getInstance() there once. If you need the tree before that, the tree will not yet have been filled and you won't get complete information, so you'd need to listen for updates.
The singleton is there so you don't need to go via CuraApplication.

Contributes to issue CURA-6600.
 2019-08-08 17:30:24 +02:00
Ghostkeeper
65360c31ef
Let Quality/Material/Variant Managers be a proper singleton 
Rather than a singleton contained within the CuraApplication class.

Contributes to issue CURA-6600.
 2019-08-08 17:04:53 +02:00
Lipu Fei
9f18ceda51 Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader 2019-07-25 14:56:27 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Jaime van Kessel
827ccd5a13 Fix mypy issues caused by scenenode iterator being correctly typed 2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Jaime van Kessel
e56e355e79 Added upgrader for 4.3 2019-07-23 11:15:13 +02:00
Ghostkeeper
8cea9c5b87
Register IntentManager in QML 
This way we can change the intent from the interface.

Contributes to issue CURA-6597.
 2019-07-05 13:03:20 +02:00
Ghostkeeper
49a6161ee8
Register IntentCategoryModel to be used in QML 
We want to be able to repeat on this model.

Contributes to issue CURA-6597.
 2019-07-04 11:02:49 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
pkuiper-ultimaker
9236f21d67
Merge pull request #5888 from Ultimaker/rename_minimum_diameter 
Rename Minimum Diameter to Maximum Tower-Supported Diameter
 2019-06-17 15:39:44 +02:00
Ghostkeeper
a38984dcec
Increment setting_version to 8 
This is required for the version upgrade.

Contributes to issue CURA-6311.
 2019-06-12 09:09:41 +02:00
Remco Burema
6f928ad97c Merge branch 'master' into feature_intent 2019-06-07 10:39:52 +02:00
Jaime van Kessel
2d8c19203e Expose intent model to QML 
CURA-6534
 2019-06-05 09:57:42 +02:00
Jaime van Kessel
7cc4ac741c Add version upgrade that adds empty intent profile to the stacks 
CURA-6534
 2019-06-03 11:49:03 +02:00
Jaime van Kessel
a1bbb46555 Add intent to recognised resource types 
CURA-6534
 2019-06-03 11:15:59 +02:00
Jaime van Kessel
a595feb24e Increase the version of the CuraContainer stack 
Since we added a new layer to it, it's version is one level higher (*DING*)

CURA-6534
 2019-06-03 11:10:20 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function 
CURA-5395
 2019-05-20 16:34:24 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00