GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 12:58:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,053 Commits 290 Branches 260 Tags
Commit Graph

3053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
377fed206c
Remove extruder creation logic from manager 
This logic is now in cura/Extruder.py.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 13:52:57 +02:00
Ghostkeeper
48eb8de9a1
Add basic extruder implementation 
This implementation can load an extruder from a definition container, but doesn't expose anything (yet). It is intended to function in much the same way as a definition model, so it must expose its relevant properties to QML.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 13:52:57 +02:00
Jaime van Kessel
6164112bf2 Setting textfield now updates correctly, even when mouse is hovering another text field. 
CURA-1278
 2016-06-01 13:35:09 +02:00
Ghostkeeper
a08e71774d
Make ExtruderManagerModel no longer a PyQt model 
It is still a model according to the MVC paradigm but not according to Qt. To be consistent with the rest, don't call it a model any more.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-01 12:03:01 +02:00
fieldOfView
2a288cd7a2 Fix typo causing a minor error when opening MaterialsPage.qml 
CURA-339
 2016-06-01 11:51:42 +02:00
fieldOfView
38c9d9e4a1 Fix highlighting the currently active (printer|quality|material) on their management pages 
CURA-1278
 2016-06-01 10:47:04 +02:00
Jaime van Kessel
969a1ccc05 Merge pull request #759 from thopiekar/patch-5 
[2.1] Set default version to 2.1.2
 2016-06-01 09:38:53 +02:00
Tim Kuipers
3953da7a50 JSON fix: support roof speed was visible when roof enabled but support not (CURA-1498) 2016-05-31 18:13:47 +02:00
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything 
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
 2016-05-31 18:07:33 +02:00
Arjen Hiemstra
f21e48adbb Register all QML files in Cura's QML directory as part of the Cura module 
Jaime asked for it.
 2016-05-31 18:07:33 +02:00
Arjen Hiemstra
4dffc414fb Make convex hull decorator respond properly to property change events 
Fixes CURA-1460
 2016-05-31 18:07:33 +02:00
Thomas Karl Pietrowski
15f84c758b Merge pull request #2 from Ultimaker/master 
Merging master from upstream
 2016-05-31 17:45:28 +02:00
Thomas Karl Pietrowski
23cb386b7c Set default version to 2.1.2 
While discussing on #718 I noticed that the splash screen still shows "master" when built from [2.1].

This sets the version to 2.1.2.
 2016-05-31 17:41:36 +02:00
fieldOfView
21e8dd151e Prevent removing the last printer, disable Activate button for current active printer 
Fixes CURA-1631
 2016-05-31 15:48:08 +02:00
fieldOfView
3638890138 Renaming a printer in the Manage Printers dialog is now reflected in the sidebar again 
Contributes to CURA-1632
 2016-05-31 15:26:38 +02:00
Jaime van Kessel
29ed8c2f5b Increased width of per-object settings panel 
CURA-1278
 2016-05-31 11:33:02 +02:00
Jaime van Kessel
152f362562 Hide button is now in correct location 
CURA-1278
 2016-05-31 11:12:22 +02:00
Jaime van Kessel
72d7bd5769 Added hide button to per object settings 
CURA-1278
 2016-05-31 11:06:26 +02:00
Jaime van Kessel
5289d5b4ac Codestyle 
CURA-1278
 2016-05-31 11:02:22 +02:00
Ghostkeeper
d7eda39cb0 Basic extruder manager model implementation 
This implementation is currently not used, and also still leaves its container stacks empty. But still...

Contributes to issues CURA-1278 and CURA-351.
 2016-05-30 17:05:15 +02:00
Ghostkeeper
932eefeb0e Correct data type for extruder number setting 
This caused a crash. Stupid mistake.
 2016-05-30 17:05:15 +02:00
fieldOfView
0c7b417244 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-30 16:45:57 +02:00
fieldOfView
b1419d8028 Fix activating (quality)profiles on the profiles page 
CURA-1278
 2016-05-30 16:45:36 +02:00
Arjen Hiemstra
d616a72bb1 Display affects/affected by in the tooltip again 
Contributes to CURA-1278
 2016-05-30 16:25:20 +02:00
Ghostkeeper
7e33b76fe2 Increment version number 
Contributes to issue CURA-1583.
 2016-05-30 16:18:54 +02:00
Arjen Hiemstra
581b9ce11f Update AutoSave plugin to work with the new settings API 
Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Arjen Hiemstra
bdc8fdf508 Turn CuraApplication::_onExit into public api as saveSettings 
Since we need it for the autosave plugin

Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Arjen Hiemstra
79892daa5e Bump API version of plugins that do not need extra porting 
Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Ghostkeeper
4f7e199158
Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-30 15:15:24 +02:00
Ghostkeeper
19695a93b5
Move extruder trains to metadata 
Uranium doesn't know about extruder trains so it can't load that. Cura doesn't have access to anything outside of metadata or settings. So I'm putting it into metadata.

Contributes to issues CURA-1278 and CURA-351.
 2016-05-30 14:27:04 +02:00
Arjen Hiemstra
93873a2ce8 Also trigger a reslice when the containerstack's containers change 
Contributes to CURA-1278
 2016-05-30 14:02:51 +02:00
Arjen Hiemstra
8039184c18 Move setting error checking to StartSliceJob and allow the job to return a proper response 
Now the job can determine if we can continue with slicing or not and if
not, why not.

This also means we can now show a message when we cannot find any
slicable objects.

Contributes to CURA-1278
 2016-05-30 13:03:06 +02:00
Arjen Hiemstra
cd2b853fff Remove "slicing" message since it is now displayed in the sidebar 
Now removed for good

Contributes to CURA-1278
 2016-05-30 13:01:25 +02:00
Arjen Hiemstra
0b3b718e87 Make CuraEngineBackend respond to changes to the global container stack 
This way we can properly connect to propertyChanged signals and trigger
a reslice.

Contributes to CURA-1278
 2016-05-30 12:23:28 +02:00
Arjen Hiemstra
c63eb3871c Account for the changes to BackendState in Uranium 
Contributes to CURA-1278
 2016-05-30 12:22:12 +02:00
fieldOfView
472012a5b9 Fix debug code introduced in f5fce512380209c1a05687ef83c4d2bf0f8b0bec 2016-05-27 17:46:53 +02:00
fieldOfView
5927aa5578 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-27 17:21:32 +02:00
fieldOfView
6aa00a951f Fix triggering actions from the extensions menu 
Contributes to CURA-1540, CURA-1278
 2016-05-27 17:21:14 +02:00
Ghostkeeper
525f608b24 Remove reference to machine_extruder_count 
This setting is not defined in this definition so it can't find the value of it here. I've re-introduced the maximum_value statically in the Jedi implementations of this setting.

Contributes to issue CURA-1278 and CURA-351.
 2016-05-27 17:18:52 +02:00
fieldOfView
f5fce51238 Fix "Defaults" button on General page 
CURA-1278
 2016-05-27 17:11:54 +02:00
Jaime van Kessel
c1b64274e8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 15:29:15 +02:00
Jaime van Kessel
89c1136d7f Per object settings can now be added & changed 
CURA-1278
 2016-05-27 15:28:54 +02:00
Ghostkeeper
41425fd36e
Replace symbols in default visible settings before usage 
These characters are just for visualisation in the code. They should never be used during the normal operation of the program, nor should they be saved to the file. So just replace them immediately.

Contributes to issue CURA-1278.
 2016-05-27 14:39:53 +02:00
Ghostkeeper
8bd06ee8ec Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 14:09:38 +02:00
Jaime van Kessel
d5dbd0f77b Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 14:01:06 +02:00
Jaime van Kessel
990d05815b Added qml files to import path 2016-05-27 14:00:38 +02:00
Tim Kuipers
aa2d09aa08 JSON lil fix: superflious comma (CURA-1616) 2016-05-27 12:44:49 +02:00
fieldOfView
545678e18b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-27 11:54:24 +02:00
fieldOfView
6355631842 Activate another machine when we remove the currently active MachineManagerModel 
CURA-1278
 2016-05-27 11:53:53 +02:00
fieldOfView
64a613f407 Fix "Activate" button on the Manage Printers page 
CURA-1278
 2016-05-27 11:47:50 +02:00