2320 Commits

Author SHA1 Message Date
Jaime van Kessel
b5a94e3f3b Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-27 13:59:09 +02:00
Lipu Fei
ddaac2fbbc Revert "Add SolidWorks plugin"
This reverts commit 1c39c90494a664fafdfdd127ace578bd274b19eb.
2017-07-27 13:02:49 +02:00
Jaime van Kessel
92679818ed Added min width & height
FIXES #600
2017-07-27 12:55:12 +02:00
Lipu Fei
1c39c90494 Add SolidWorks plugin
CURA-3823
2017-07-27 12:36:34 +02:00
Lipu Fei
439f3e5029 When an error check finishes, only trigger auto-slicing if needed
CURA-4092

Many things can trigger an error check, but Cura should only auto-slice
if the error check was scheduled due to a value change.
2017-07-27 10:20:06 +02:00
Lipu Fei
c16bfa8949 Remove unnecessary if checks
CURA-4048
2017-07-27 09:54:30 +02:00
Lipu Fei
9fca677d40 Fix comment location
CURA-4048
2017-07-27 09:52:05 +02:00
Jaime van Kessel
e636dbdd10 Merge pull request #2107 from fieldOfView/feature_pyserial_usb_detection
Use pyserial to list serial ports
2017-07-27 09:31:35 +02:00
Lipu Fei
d9d39c41df Fix auto-slicing upon value changes and error checks
CURA-4092

- Keep the error check finished signal.
- Restore the old way of triggering an auto-slicing which depends on a
  setting value change singal.
- Add a mechanism to make sure that if there is an error check, the
  auto-slicing will only be triggered after the check finishes.
2017-07-27 09:03:06 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Lipu Fei
686ca803ee Set correct machine name when creating a new machine from a project
CURA-4074
2017-07-26 15:08:15 +02:00
Lipu Fei
9c1d23fe5b Make sure MachineManager initializes after ContainerRegistry does
CURA-4084

When MachineManager gets created, it will find and set the current
active machine. This requires the ContainerRegistry to be initialized
first.
2017-07-26 14:09:18 +02:00
Lipu Fei
93731b8d1f Trigger auto-slice based on stackValidation instead of stack/setting changes
CURA-4084

Stack error checks are scheduled with a delay, and when a container is
changed (e.g. Quality), the auto-slice may get triggered before the
error check is done. Because the error check result is cached, the
auto-slicing will use the previous result instead of new. So, the
auto-slicing should be triggered when a stack validation is finished
instead of when a stack/setting gets changed.
2017-07-26 14:09:18 +02:00
Thomas Karl Pietrowski
fe3bccaf5f LayerView: Set color for comp. mode text
Before it was using the system's default, which is not that nicely visible, if you are using a dark theme.
2017-07-25 09:35:42 +02:00
Jaime van Kessel
24f89e3714 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-24 17:18:56 +02:00
Jaime van Kessel
a8a475a1a7 Only stop the camera if the timer is actually running
CURA-4081
2017-07-24 17:18:04 +02:00
Ghostkeeper
89cd11e62a
Upgrade g-code flavour Volumatric to Volumetric
Contributes to issue CURA-3998.
2017-07-24 16:19:59 +02:00
Lipu Fei
3aabbab11f Correctly handle IndexError for defaultColors
CURA-4072

defaultColors is a list, so it's not KeyError but IndexError.
2017-07-21 16:03:11 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Lipu Fei
ed91bf816f Correct definition_changes location in 2.6 to 2.7 upgrade script
CURA-4053
2017-07-21 11:36:47 +02:00
Lipu Fei
15a6b5626d Remove useless code
CURA-4053
2017-07-21 11:32:11 +02:00
Lipu Fei
141cfe776e Fix handling old stack without definition_changes and add doc
CURA-4053
2017-07-21 11:28:47 +02:00
Jaime van Kessel
326c4cc4a4 Removed code duplication
CURA-4053
2017-07-21 10:15:20 +02:00
Jaime van Kessel
4d0c46508a Fixed incorrect naming of printcores in error messages
CURA-3734
2017-07-20 15:17:46 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used.
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
2017-07-20 13:30:57 +02:00
Lipu Fei
22c1a118a8 Fix conflict detection when there is no definition_changes
CURA-4053

An old project file doesn't have the definition_changes container in the
stacks. When this is the case, Cura should also check if the definition
changes container in an existing stack is empty or not for project file
loading conflict detection.
2017-07-20 10:28:09 +02:00
Lipu Fei
356b3cf0ca Remove unnecessary code
CURA-4053
2017-07-19 16:44:04 +02:00
Lipu Fei
9288f408e5 Correctly detect old project files for conflicts
CURA-4053

- In Cura 2.5, there is no definition_changes in the stack. This is now
  taken into account when doing conflicts detection.
- In Cura 2.5, we have empty containers named as "empty_variant" and
  such. Those are now properly handled in conflict detection.
2017-07-19 16:39:04 +02:00
Lipu Fei
7148c71877 Change extruder stacks for conflicts only if the global stack is found
CURA-4053

If the global stack is not found, we assume the machine is not there and
default to create a new one. If the machine is found and there is not
conflicts, then we check the extruders associated for conflicts.
2017-07-19 16:35:52 +02:00
Lipu Fei
3474bb0738 Fix project conflict resolving for global stack and extruder stacks
CURA-4053

- Fix that if the resolve strategy is new for machine, Cura should
  always create new global and extruder stacks
- Fix possible duplicated IDs when "Create New" machine is selected
2017-07-19 15:20:29 +02:00
Lipu Fei
834fd055b6 Fix conflict resolve strategies in project loading
CURA-4053

When loading a project file:

- Only check if the global stack exists to detect conflicts instead
  of checking the global stack and the extruder stacks. It can happen
  that the global stack exists while the extruder stacks not or the
  other way around.

- Always assign a resolve strategy to container(s). There can be
  "None" strategies and those were not handled correctly.
2017-07-19 14:48:11 +02:00
Jaime van Kessel
e45d045880 Merge branch 'mb-fix-gcodeArea' of https://github.com/smartavionics/Cura 2017-07-19 09:50:49 +02:00
Ghostkeeper
dbcf50162f
Fix spelling of combined English words
Contributes to issue CURA-3998.
2017-07-18 13:10:17 +02:00
Ghostkeeper
de8a700bd4
Fix spelling of statistics sending message
Found while working on CURA-3998.
2017-07-18 13:10:16 +02:00
Lipu Fei
024f2384e0 Fix mutable arg problem and rename arg
CURA-4049
2017-07-18 08:32:22 +02:00
Mark Burton
f66bbf0dac Fix recently broken setting of gcode area value property setting on focus loss. 2017-07-17 22:01:43 +01:00
Lipu Fei
3c663d576c Do not save setting_version when serializing an XML material
CURA-4053

setting_version is derived from the "version" tag in the XML material
schema.
2017-07-17 13:54:22 +02:00
Lipu Fei
ecdf0bbe33 Fix setting_version in metadata for XMLMaterial
CURA-4053
2017-07-17 13:40:12 +02:00
Lipu Fei
63b71b8661 Fix typo in comments 2017-07-17 13:39:03 +02:00
Jaime van Kessel
afe5f56862 If a default color is used, the layer view now correctly uses it. 2017-07-17 11:44:54 +02:00
Jaime van Kessel
53cec3bea4 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-17 11:10:42 +02:00
Jaime van Kessel
99b236c8d4 Removed "fix" that caused project files to create new instances if there was no conflict.
The overriding doesn't make any sense. The original commit mentions that it should fix something, but it doesn't acutally fix it. It seems
the original issue was fixed in the proper place, leaving this code to mess everything up.

CURA-3756
2017-07-17 11:08:31 +02:00
Lipu Fei
68989f2871 Use optional arg in serialize() to exclude network auth keys
CURA-4049
2017-07-17 11:04:08 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Jaime van Kessel
82ff9dfe1b Merge branch 'feature_machine_settings_27' of https://github.com/fieldOfView/Cura 2017-07-13 13:44:34 +02:00
Youness Alaoui
7e7e15a12b Fix MachineManager connection to OutputDeviceManager signals late.
If a PrinterOutputDevice is able to connect quickly to a machine, then
by the time the MachineManager is created and connects to the signal,
it will be too late, and it might miss that there is already connected
devices.

# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputDeviceManager.py
2017-07-12 14:06:08 +02:00
fieldOfView
6cb5412f91 Fix creating a new definition_changes container
global_container_stack.definitionChanges always returns a container, global_container_stack.findContainer({"type": "definition_changes"}) does not (because an empty container does not have the type "definition_changes".
2017-07-12 13:47:31 +02:00
fieldOfView
c27859ddc5 Fix spelling for consistency 2017-07-11 23:32:47 +02:00
fieldOfView
1b4bd05106 Make doubly sure that settings are changed before closing dialog 2017-07-11 23:27:31 +02:00
fieldOfView
d00bb2524e Fix layout
Dialog is now more robust against being too small
2017-07-11 22:33:05 +02:00