Commit graph

9412 commits

Author SHA1 Message Date
Ghostkeeper
012d299d98
Prevent circular import
When this is imported during the __init__, it'll long have been imported elsewhere and won't need to import it again but still guarantees that it is actually imported if no other module does it first.

Contributes to issue CURA-4024.
2017-07-10 16:42:38 +02:00
Ghostkeeper
ee52e1b9ea
Reposition prime tower automatically
This actually looks really nice. It just moves right along that border there. Eventually we could also auto-position the X position but for now this is fine.
2017-07-10 14:21:40 +02:00
Lipu Fei
7d9f99c0e8 Merge pull request #2083 from Ultimaker/thin_walls
feat: print thin walls setting (CURA-4023)
2017-07-10 14:14:26 +02:00
Tim Kuipers
9f4e3fcf56 Merge branch 'feature_gradual_support' 2017-07-10 14:14:00 +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
Ghostkeeper
8822307e02
Cache preferences instance during start-up
Perhaps a bit faster and less code duplication.

Contributes to issue CURA-4024.
2017-07-10 11:54:27 +02:00
Ghostkeeper
9bfe18393f
Make sure the preferences file doesn't always get upgraded
When the setting is equal to the default the setting_version won't get written to the preferences file. In that case the version upgrade system assumes that the setting_version was 0 or 1 and upgrades it.

This makes sure that the setting is never equal to the default so that it always gets written.

Found while working on CURA-4024.
2017-07-10 11:45:03 +02:00
Ghostkeeper
f0d327c0d0
Set setting_version properly on new stacks so you don't need to upgrade
I don't think stacks had a setting_version property previously.

Contributes to issue CURA-4024.
2017-07-10 11:22:35 +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
Ghostkeeper
4ad9ebc444
Merge branch 'master' of https://github.com/tsaaristo/Cura into tsaaristo-master 2017-07-10 09:14:41 +02:00
Tim Kuipers
dcdc1a1f63 feat: print thin walls setting (CURA-4023) 2017-07-07 16:06:31 +02:00
Ghostkeeper
d9c6fc63f2
Clarify description of skin overlap percentage setting
It's unclear what this was a percentage of.

Contributes to issue CURA-3892.
2017-07-07 14:59:35 +02:00
Jaime van Kessel
4275555f44 Merge branch 'CURA-3858' of github.com:Ultimaker/Cura 2017-07-07 13:44:00 +02:00
Jaime van Kessel
ab467a65a2 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-07 13:42:36 +02:00
Ghostkeeper
4edd91de23
Fig passing signals to topbar
Topbar is now in the lead on whether the print monitor should be shown or not. As it should be.

Contributes to issue CURA-4010.
2017-07-07 13:37:31 +02:00
Ghostkeeper
d277b16807
Capitalise '3D'
3d looks ugly to me.
2017-07-07 13:37:30 +02:00
Jaime van Kessel
4afc422d5d Merge branch 'spaghetti_infill_correction' of github.com:Ultimaker/Cura 2017-07-07 13:29:38 +02:00
Tim Kuipers
e7eaeb41bd setting: spaghetti_infill_extra_volume (CURA-3987) 2017-07-07 12:53:49 +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
89c5fb2d15 Merge pull request #2037 from Ultimaker/feature_zoom_to_mouse
Added zoom to mouse preference
2017-07-07 11:40:26 +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
Jaime van Kessel
12d8c7f4d7 Merge branch 'master' of https://github.com/maukcc/Cura 2017-07-07 09:19:47 +02:00
Ghostkeeper
ef89fab126
Fix spaces after comma according to code style
Contributes to issue CURA-3587.
2017-07-06 16:13:42 +02:00
Tim Kuipers
574ae4b52a Merge branch 'smartavionics-mb-support-real-reprap-gcode' 2017-07-06 15:15:58 +02:00
Ghostkeeper
b346dd7893
Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-06 15:03:58 +02:00
Ghostkeeper
1b3750caae
Merge branch 'spaghetti_infill_total_volume' 2017-07-06 15:03:48 +02:00
Tim Kuipers
23a98dd959 Merge branch 'mb-support-real-reprap-gcode' of https://github.com/smartavionics/Cura into smartavionics-mb-support-real-reprap-gcode 2017-07-06 15:00:38 +02:00
tsaaristo
ad87f154f3 Speed up sidebar-settings scrolling
Scroll three rows in one scroll event instead of one
2017-07-06 15:58:32 +03:00
Lipu Fei
071005541c Use XMLMaterialProfile version tag to determine its version
CURA-2724
2017-07-06 14:47:59 +02:00
Lipu Fei
b95426bee3 Add setting_version for Preferences
CURA-3975
2017-07-06 14:33:01 +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
Lipu Fei
3983da30aa Update setting_version to 2 for qualities
CURA-3975
2017-07-06 14:19:20 +02:00
Lipu Fei
72afefbfd4 Update setting_version to 2 for variants
CURA-3975
2017-07-06 14:19:20 +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
eb88ad5a3d Change mode to 0644 for all quality files
CURA-3975
2017-07-06 13:38:39 +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
ead94a8456 Cura should register actual stack MIME types instead of the generic Uranium stack type
CURA-3975

When the ContainerRegister loads all container files, it decides which
actual class to use based on the registered MIME type of that file.
Because Cura registers the GlobalStack and ExtruderStack files as the
generic Uranium MIME type, the register loads them as Uranium
ContainerStacks. This commit solves this problem.
2017-07-06 11:30:05 +02:00
Jaime van Kessel
cd7c8bb753 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-06 10:46:59 +02:00
Jaime van Kessel
95cacb8300 Added missing translate to topbar 2017-07-06 10:46:29 +02:00
Lipu Fei
c196a4bf00 Fix stack file version number in VersionUpgrade26to27
CURA-3975
2017-07-06 10:42:26 +02:00
Lipu Fei
3d48024a47 Override getConfigurationTypeFromSerialized for GlobalStack
CURA-3975

GlobalStack has metadata type "machine", which is different from what is
registered in the VersionUpgradeManager "machine_stack". This commit
makes sure that Cura can find the correct upgrade route for the
GlobalStack files.
2017-07-06 10:26:02 +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
Lipu Fei
16a078b9a6 Update SettingVersion to 2 for renaming the quality profiles
CURA-3975

Update SettingVersion to 2 so we can create an upgrade to rename the
quality profiles.
2017-07-06 10:25:51 +02:00
Lipu Fei
afb923401e Set versions correctly for container stacks and preferences
CURA-3975

The upgrade for machine and extruder stacks and the preferences files
don't work because the current version registering doesn't take into
account the 1000000 multiplier and the settings_version.
2017-07-06 10:25:50 +02:00