Commit graph

3088 commits

Author SHA1 Message Date
ChrisTerBeke
f75d91071a Remove invisible flag from allowed command line options to trigger non-gui mode 2017-12-22 11:39:58 +01:00
ChrisTerBeke
b29047abd3 Small fixes for disable user data triggering preferences window 2017-12-22 11:38:56 +01:00
Jaime van Kessel
52d25042eb Machines now re-appear after timeout
CL-541
2017-12-22 11:29:13 +01:00
ChrisTerBeke
56435f12c0 Add additional debug logging in machine manager for changing stack setup 2017-12-21 17:12:39 +01:00
ChrisTerBeke
0e1cd99578 Add flag to ignore discard or keep dialog when changing print setup 2017-12-21 17:08:44 +01:00
Jack Ha
663ceab069 Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525 2017-12-21 16:53:43 +01:00
Aleksei S
c3954c40ac Merge branch 'master' of github.com:Ultimaker/cura 2017-12-21 16:25:54 +01:00
Aleksei S
447c6e7e23 Added Disable link style
CURA-4630
2017-12-21 16:25:13 +01:00
Lipu Fei
4e90204620 Only push aways other objects if they are printing meshes
CURA-4705
2017-12-21 15:51:24 +01:00
Jack Ha
9ff15bf72d Fixed not always updating objects list when changing build plate number by adding signals. CURA-4525 2017-12-21 15:42:23 +01:00
Jaime van Kessel
c6458358ba Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-21 15:38:17 +01:00
Jack Ha
fda4badab1 Checked build plates in context menu now actually match the selected item's build plates; changed collapse arrow. CURA-4525 2017-12-21 15:08:46 +01:00
Jack Ha
0839125076 Fix platform physics not working across different build plates. CURA-4525 2017-12-21 13:31:19 +01:00
Jaime van Kessel
9754aa5397 Material & hotend updated callback is enabled for LegacyUM3 again
CL-541
2017-12-21 13:16:44 +01:00
Jack Ha
9f8eae006c Fix push free. CURA-4525 2017-12-21 13:15:10 +01:00
Jack Ha
c05e6b43ff Fixed platform physics. CURA-4525 2017-12-21 13:11:32 +01:00
Jack Ha
312bd137c2 Fix merge error, a variable got renamed. CURA-4525 2017-12-21 11:03:32 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Lipu Fei
0a0db39f02 deepcopy value from the stack
CURA-4705
2017-12-21 09:27:53 +01:00
Jaime van Kessel
041b1830fe Re-added manual printer adding
CL-541
2017-12-20 16:30:40 +01:00
Jaime van Kessel
23330cd086 Camera feed is also stopped when NetworkCamera is destroyed
CL-541
2017-12-20 15:39:52 +01:00
Jaime van Kessel
95b1e8f68c Ensured that multiple requests from the same camera are no longer possible
CL-541
2017-12-20 15:38:47 +01:00
Lipu Fei
588335c6db Make sure only single-extrusion machines will be fixed
CURA-4713
2017-12-20 13:42:58 +01:00
Lipu Fei
1a6a6f74d5 Fix SettingOverrideDecorator for non printing meshes
CURA-4705

- Do not set a "secret" property in the SceneNode to indicate whether a
  node is a non-printing-mesh because SceneNode will not copy that
  property during a deepcopy. Store it in the SettingOverrideDecorator
  and make it accessible through a decorator call
- Try to trigger an auto-slice AFTER the non-printing-meshes flag is
  updated, not before.
2017-12-20 12:26:50 +01:00
Ghostkeeper
a860154831
Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-20 10:20:30 +01:00
Diego Prado Gesto
8af52fb61b CURA-4726 Creating unique name for the per object stack. Keep the prefix so it is easy to trace when debugging instead of just a number 2017-12-19 19:44:04 +01:00
Diego Prado Gesto
fc78402146 CURA-4726 Using a string for the per object stack id instead of the id
of the instance (that is an integer) because the new ContainerRegistry
searches by string
2017-12-19 17:26:30 +01:00
Ghostkeeper
05e232b498
Move LegacyProfileReader-specific logic into the plug-in itself
This had the documentation that it should edit the profiles returned by LegacyProfileReader. Instead, just return correct profiles from the reader...

Contributes to issue CURA-4715.
2017-12-19 17:16:32 +01:00
Ghostkeeper
c6a2b1b9c9
Ignore any additional stacks in imported profile
When you import a multi-extrusion file into a single-extrusion printer, don't crash but simply ignore the additional stacks.

Contributes to issue CURA-4715.
2017-12-19 17:08:51 +01:00
Ghostkeeper
c5e33e45a4
Fix setting definition if importing profile without printer-specific profiles
Fixes a crash.
2017-12-19 13:24:20 +01:00
Jaime van Kessel
bc8741ef08 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-19 10:40:32 +01:00
Jack Ha
d6c6aa1c71 CURA-4715 fix updating custom profile 2017-12-18 17:03:18 +01:00
fieldOfView
77daad1f98 Also exit when the crash handler dialog is not created 2017-12-18 12:19:56 +01:00
fieldOfView
d839b62e42 Prevent CrashHandler creating a QWidget before QApplication is created 2017-12-18 12:18:22 +01:00
ChrisTerBeke
e3a996073e Remove duplicate --headless argument as it is now in Uranium 2017-12-18 11:09:41 +01:00
Ghostkeeper
d5b3f18da8
Split all non-word characters for making abbreviations
So now cases like CR-10 are more appropriately split into ['CR', '10'].

Fixes #2910.
2017-12-18 11:01:15 +01:00
ChrisTerBeke
443e155cf7 Adding set stage back 2017-12-18 10:50:50 +01:00
ChrisTerBeke
6666829939
Merge pull request #2940 from thopiekar/master-prepare-for-com-support
(DONE) Registration of arguments of plugins, add invisible mode (No splashscreen!) and "--debug" mode as argument
2017-12-18 10:49:44 +01:00
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
Jaime van Kessel
d3b9ac0d45 Also start reworking the USBPrint.
It's also time for some much needed code cleaning in that bit. The auto-detect is moved to it's own job,
which should make it a whole lot easier to disable it all together.

CL-541
2017-12-14 17:37:57 +01:00
Jaime van Kessel
24bd32477a Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-14 13:03:02 +01:00
Jaime van Kessel
80526893c2 Made setAcceptsCommands protected
CL-541
2017-12-14 09:36:31 +01:00
Jaime van Kessel
005ba4ac53 Changed hotend properties to float
CL-541
2017-12-14 09:34:16 +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