Commit graph

2845 commits

Author SHA1 Message Date
Lipu Fei
248fe37ed9 setDefinition() takes the ID instead of the container
CURA-4713
2017-12-15 14:54:26 +01:00
Lipu Fei
f26872ec1f Apply fix for single extrusion machines when a new global stack is added
CURA-4713

Now the machines are not all loaded in the beginning, so the old way of
adding extruder stacks for old single-extrusion machines don't work.
With this fix, it now happens whenever a global stack is added to the
registry.
2017-12-15 14:51:48 +01:00
Aleksei S
2c18127cc1 Tests: Removed python circular import dependency and added empty containers
CURA-4687
2017-12-15 09:43:02 +01:00
Jack Ha
4519f9b46a CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling 2017-12-13 14:04:02 +01:00
Jack Ha
80afda1912 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-13 13:53:35 +01:00
Jack Ha
bae2193bfb Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-13 13:39:22 +01:00
Jack Ha
19b56404c6 Fix empty quality slider on start.
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple

Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.

CURA-4707
2017-12-13 13:33:05 +01:00
Ghostkeeper
9ea0119011
Rename 'exception' to 'error'
Error is a less technical term, so it's more user friendly.
2017-12-13 12:58:24 +01:00
Lipu Fei
6e6dc493f1 Fix material loading for unknown names 2017-12-13 12:27:55 +01:00
Jack Ha
f28846acb9 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-12 15:43:32 +01:00
Aleksei S
3516d01f3d Move back machine selection
CURA-4234
2017-12-12 15:30:19 +01:00
Aleksei S
6968c089db Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
CURA-4234
2017-12-12 11:26:17 +01:00
Aleksei S
fb91edd7eb Solve arrange and multiply models issue
CURA-4703
2017-12-12 10:43:19 +01:00
Ghostkeeper
097cc72d89
Document why we're only returning full profiles
It's a limitation of the quality manager that would require major refactoring there to fix.

Contributes to issue CURA-4243.
2017-12-11 09:44:56 +01:00
Thomas Karl Pietrowski
79cb1a1293 closeAllWindows seems to take no effect - use exit instead
Looks like it does not work, because there was never a window or any other window on top of QApplication.
.exit() should let us out of the main loop.
2017-12-10 01:08:06 +01:00
Thomas Karl Pietrowski
1cd107965c Close all windows, if there is no main window 2017-12-10 00:39:20 +01:00
Thomas Karl Pietrowski
f1d5bc38dc Adding help arguments manually
.. and also print and exit as it normally does, when enabled.
2017-12-09 23:01:26 +01:00
Thomas Karl Pietrowski
8e89c1b361 No comment on this.. 2017-12-09 17:40:06 +01:00
Thomas Karl Pietrowski
7e7303a7e3 Code style 2017-12-09 16:00:56 +01:00
Thomas Karl Pietrowski
37cf78487e headless+invidible: It is all about being hidden
So don't show any gui.
2017-12-09 15:56:52 +01:00
Thomas Karl Pietrowski
4b8d05092d Adding preRun and move last commandline argument check to it. 2017-12-09 15:56:06 +01:00
Thomas Karl Pietrowski
c62b04089f Moving setActiveStage("PrepareStage") to initializeEngine() in UM 2017-12-09 15:43:05 +01:00
Thomas Karl Pietrowski
3e775f71fd Typo 2017-12-09 13:00:41 +01:00
Thomas Karl Pietrowski
f9554475be CuraApplication: Allow getting kwargs and pass them to super().__init__() 2017-12-09 11:47:23 +01:00
Thomas Karl Pietrowski
e578014a2e Passing the already parsed args 2017-12-09 11:25:01 +01:00
Thomas Karl Pietrowski
bc7cb1491d Removing "Embedding" option again 2017-12-09 02:13:47 +01:00
Thomas Karl Pietrowski
ab6508657d Creating an argparser early and add a "debug" option
Makes sure we don't log anything at the moment, when debug is passed. Otherwise early errors are not displayed and passed to log files.
2017-12-09 02:13:31 +01:00
Thomas Karl Pietrowski
61b6831e62 CuraApplication: Making it one line again
Don't know why the pylint marker is here..
2017-12-09 01:21:58 +01:00
Thomas Karl Pietrowski
1a9c152041 CuraApplication: Don't parse -h or --help before last check 2017-12-09 00:08:13 +01:00
Thomas Karl Pietrowski
b098b167e5 Fixing name 2017-12-08 22:31:04 +01:00
Thomas Karl Pietrowski
044c538887 CuraApplication: Allow unknown arguments 2017-12-08 22:09:49 +01:00
Thomas Karl Pietrowski
35ed042a72 Revert "CuraApplication: Making use of Uranium commandline tools"
This reverts commit 315efae53b.
2017-12-08 21:49:00 +01:00
Thomas Karl Pietrowski
9210d38412 Revert "CuraApplication: Getting argparser from Uranium"
This reverts commit 8c74092f48.
2017-12-08 21:31:41 +01:00
Thomas Karl Pietrowski
0967651a49 CuraApplication: Adding last check for unknown arguments into _onEngineCreated
So after everything is loaded, we can blame the user about wrong arguments.
2017-12-08 20:28:46 +01:00
Thomas Karl Pietrowski
315efae53b CuraApplication: Making use of Uranium commandline tools 2017-12-08 20:27:25 +01:00
Thomas Karl Pietrowski
8c74092f48 CuraApplication: Getting argparser from Uranium 2017-12-08 20:18:38 +01:00
Thomas Karl Pietrowski
abc2cdb701 CuraApplication: Adding important note about the argparser 2017-12-08 20:18:11 +01:00
Ghostkeeper
430f3dad27
Use GlobalContainerStack.definition instead of .getBottom
If we know it's a CuraContainerStack we can use .definition safely.

Contributes to issue CURA-4243.
2017-12-08 16:57:48 +01:00
Thomas Karl Pietrowski
b22981d089 It is cls not self! 2017-12-08 16:12:56 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Thomas Karl Pietrowski
11cf642a6e COM: Prevent splash screen, when Embedding is set.
So when dispatching our service we won't see any splash screen. Just like we want for headless applications.
2017-12-08 15:43:28 +01:00
Thomas Karl Pietrowski
83d8c693bc CuraApplication: Removing superflous check
Imagine that there was no "single_instance" in parsed_command_line, then the second half of the if-clause would automatically crash.
Also we defined single_instance to be False, whenever not set. Therefore it is always there.
Also since no issues ever happened here, let's remove this check.
2017-12-08 15:23:35 +01:00
Thomas Karl Pietrowski
00a77da9d4 COM: Adding missing argument for DCOM 2017-12-08 15:19:28 +01:00
Diego Prado Gesto
012b8aef62 Merge branch 'feature_sidebar_plugin_target' 2017-12-08 09:45:52 +01:00
ChrisTerBeke
9bf954643c Use new method of setting active stage when needing to switch to monitor 2017-12-07 11:56:52 +01:00
Jack Ha
79d5282b36 Added quality_changes to ContainerRegistry, rename saveStack to saveContainer.
Contributes to issue CURA-4243.
2017-12-07 10:39:13 +01:00
ChrisTerBeke
ee643610e5 Fix sidebar loading and unloading depending on active stage 2017-12-06 17:46:18 +01:00
Jack Ha
4245847dab Moved saveSettings and saveStack to Uraniums ContainerRegistry.
Contributes to issue CURA-4342.
2017-12-06 16:39:59 +01:00
Diego Prado Gesto
9561827bda CURA-4680 Checking if there is global stack in the ExtruderManager.
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
2017-12-06 14:12:51 +01:00
Jack Ha
f0c3aaf532 Add built-in profiles to profiles screen.
Contributes to issue CURA-4243.
2017-12-06 14:05:09 +01:00