2283 Commits

Author SHA1 Message Date
Lipu Fei
024f2384e0 Fix mutable arg problem and rename arg
CURA-4049
2017-07-18 08:32:22 +02: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
Jaime van Kessel
82ff9dfe1b Merge branch 'feature_machine_settings_27' of https://github.com/fieldOfView/Cura 2017-07-13 13:44:34 +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
Jaime van Kessel
391533e939 Slice info is now sent by https 2017-07-11 17:09:59 +02:00
fieldOfView
219d1938c2 Move labels into components with the controls...
...so they are both children of the same TooltipArea
2017-07-11 16:40:05 +02:00
fieldOfView
2ba0dd094e Simplify layout 2017-07-11 15:54:21 +02:00
Ghostkeeper
d6941fef2f
Interpret material compatible 'unknown' as 'yes'
We decide whether it is unknown (or unsupported) based on the availability of profiles for it.

Contributes to issue EM-1662.
2017-07-11 13:23:51 +02:00
fieldOfView
aa7ab2e0a7 Remove unnecessary eval() construct 2017-07-10 16:49:03 +02:00
Ghostkeeper
6d2b46244f
Home printer after aborting
Otherwise the head gets left on top of the print and you'd have to manually move it aside after each abort.
2017-07-10 13:38:40 +02:00
fieldOfView
79e38407c8 Add tooltip to "Number of Extruders" control 2017-07-10 12:34:39 +02:00
fieldOfView
e2c978f88b Remove unused extruderContainerIndex property
Since the work on CuraContainerStack, the definition changes container for the extruder and for the global stack are always on the same index
2017-07-10 12:23:27 +02:00
fieldOfView
7fe674bc5b Improve test for empty containers 2017-07-10 12:19:19 +02:00
Ghostkeeper
81e07b1530
Use stack properties instead of .findContainer(type = ...)
Recently we changed the empty containers such that there is only one empty container instance and it doesn't have the proper type any more. Instead we have properties on the stack that allows us to find the container with the proper type. It's faster and easier to use.
We've had a few bugs about this so I decided to update all of them to remove those for the future, except the ones in plugins/MachineSettingsAction/MachineSettingsAction.py because we have a pending pull request that fixes those. Fixing them would give merge conflicts for fieldOfView.

It doesn't really belong to CURA-4024 but I'm sticking it under that nomer anyway to get it reviewed.
2017-07-10 10:35:03 +02:00
fieldOfView
d6ddf15e24 Fix selecting material for UM2 when switching from UltiGcode 2017-07-09 16:46:25 +02:00
fieldOfView
8c2f556616 Switch to an appropriate material when changing the material diameter
If we don't do this, the material will always override the setting in Machine Settings
2017-07-09 16:41:24 +02:00
fieldOfView
ddc94e9bec Improve readability 2017-07-09 15:44:01 +02:00
fieldOfView
b8ea762242 Override some tooltips for clarity in the context of Machine Settings 2017-07-09 14:57:51 +02:00
fieldOfView
cb7b845a32 Add tooltips to the head polygon fields 2017-07-09 14:39:55 +02:00
fieldOfView
4705ada6ef Add tooltip to gcode areas 2017-07-09 13:35:50 +02:00
fieldOfView
1eeb953072 Restructure propertyProviders to be part of setting components 2017-07-09 13:12:25 +02:00
fieldOfView
a2332ae304 Add tooltips to most fields 2017-07-09 12:32:16 +02:00
fieldOfView
de0ac5ccff Use CuraContainerStack API 2017-07-09 11:28:14 +02:00
Jaime van Kessel
4275555f44 Merge branch 'CURA-3858' of github.com:Ultimaker/Cura 2017-07-07 13:44:00 +02:00
fieldOfView
6503b87a3a Add a way to cancel a download
and cancel download when closing the window
2017-07-07 12:30:58 +02:00
fieldOfView
6b05bd21fb Show why the download button is disabled 2017-07-07 12:11:54 +02:00
fieldOfView
0a163439a4 Use system-style progress bar. 2017-07-07 12:03:05 +02:00
Lipu Fei
8827b02020 Create persistent temporary file on Windows for plugins
CURA-3856
2017-07-07 10:49:06 +02:00
Jaime van Kessel
44a22cbd3a Removed binding loops
CURA-3856
2017-07-07 10:41:44 +02:00
Jaime van Kessel
fc70715cd1 Fixed plugin installing for windows
CURA-3856
2017-07-07 10:31:26 +02:00
Lipu Fei
071005541c Use XMLMaterialProfile version tag to determine its version
CURA-2724
2017-07-06 14:47:59 +02:00
Lipu Fei
b4949a164c WIP: Add temporary fix to make materials work with 2.7 version upgrade
CURA-3975

This is a temporary fix to make materials work with 2.7 version upgrade
because of the setting_version change from 1 to 2. This MUST be fixed
after we have decided on how to determine the versions of an
XMLMaterialProfile.
2017-07-06 14:19:30 +02:00
Lipu Fei
5bf080950f Fix upgrade from 2.5 to 2.6 to 2.7
CURA-3975

- Set Preferences setting_version in CuraApplication so Preferences can
  get upgraded correctly
- Fix upgrade script for 2.5 to 2.6
- Fix upgrade script for 2.6 to 2.7 which relies on the upgrade of 2.5
  to 2.6
2017-07-06 14:19:26 +02:00
Ghostkeeper
bd75102ee5
Fix saving g-code if no quality profile is set
If the quality profile was 'empty', then the container type wasn't properly set, so you can't find any quality profile. This gets the quality profile from the stacks, so you will find the empty profile (which has the wrong type but at least you can try to request metadata from it).
2017-07-06 13:52:54 +02:00
Lipu Fei
4727e4aa95 Remove unused imports
CURA-3975
2017-07-06 12:13:30 +02:00
Lipu Fei
4e3ff1b770 Fix version upgrade for 2.5 to 2.6
CURA-3975

- Preferences version is not set correctly
- The upgrade script should use a standalone version string because the
  CuraApplication.SettingVersion can change
2017-07-06 12:11:28 +02:00
Lipu Fei
c196a4bf00 Fix stack file version number in VersionUpgrade26to27
CURA-3975
2017-07-06 10:42:26 +02:00
Lipu Fei
42858b4715 Add upgrade script for 2.6 to 2.7 to rename quality profiles
CURA-3975
2017-07-06 10:26:02 +02:00
Ghostkeeper
6cac15de7d
Use default parameter to obtain default colour
There is a built-in mechanism for this, so we don't need to do this ourselves.
2017-07-06 09:48:36 +02:00
Ghostkeeper
bb68f488db
Make material finding more robust
The .findContainer technique is obsolete since we now just have a field for this.

Hopefully contributes to issue #2053.
2017-07-06 09:41:28 +02:00
Jaime van Kessel
ef51897b71 Fixed removable drive error spam on Windows 2017-07-05 14:48:02 +02:00