GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 07:28:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,410 Commits 290 Branches 260 Tags
Commit Graph

2253 Commits

Author SHA1 Message Date
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
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
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
Jaime van Kessel
289c9ed8ee Network printing now sees empty state as idle 2017-07-05 11:00:00 +02:00
Jaime van Kessel
3ee72a5393 Fixed sending wrong setting for bed adhesion 
CURA-3858
 2017-07-04 10:19:11 +02:00
Jaime van Kessel
1b6152b793 Send print times & extruders as string 
CURA-3858
 2017-07-04 09:44:09 +02:00
fieldOfView
5fec3d4f6d Replace mock borders with true borders 2017-07-03 16:04:18 +02:00
Mark
8a55469499 Revert "Add margins to buttons and progressBar so they align" 
This reverts commit 8776cedd278ab0830f4f621d013e7ef75efbb9d1.
 2017-07-03 14:49:26 +02:00
Mark
8776cedd27 Add margins to buttons and progressBar so they align 
CURA-3856
 2017-07-03 14:46:31 +02:00
Jaime van Kessel
a1413e8162 Added active mode to sliceinfo 
CURA-3858
 2017-07-03 13:18:23 +02:00
Jaime van Kessel
d69736ac34 Filter \n from transformation string 
CURA-3858
 2017-07-03 13:13:42 +02:00
Jaime van Kessel
1682348629 Send data to new server 
CURA-3858
 2017-07-03 13:10:17 +02:00
Jaime van Kessel
3abde17466 Updated list of settings to be sent. 
CURA-3858
 2017-07-03 12:57:50 +02:00
Jaime van Kessel
e98a6d76ba Added close button 
CURA-3856
 2017-06-30 15:40:51 +02:00
Jaime van Kessel
52954460a3 Added refresh option for plugin list. 
This fixes the issue that if you don't have internet connection on first start of the browser, you'd need a reboot of cura to get the list.

CURA-3856
 2017-06-30 15:30:22 +02:00
Jaime van Kessel
5d0908e8ce Added handling for timeout & network connection broken 
CURA-3856
 2017-06-30 15:19:53 +02:00
Jaime van Kessel
782dea040a Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-30 13:51:17 +02:00
Jaime van Kessel
a8492b3a6f Added few more fields (brand & manufacturer) to brand & machine 
CURA-3858
 2017-06-30 13:33:39 +02:00
Ghostkeeper
71c146f437
Always send not-printed objects to slicer regardless of build volume 
Objects that aren't printed, such as infill meshes, can simply be sent to the slicer regardless of whether they are inside or outside the build volume, because they don't generate g-code in their own volume. This way you can have a model that is partially outside the build volume that still does its anti-overhang task or whatever.

Contributes to issue CURA-3951.
 2017-06-30 13:04:09 +02:00
Jaime van Kessel
9db00fa9c0 Also send if the user changed the machine definition 
CURA-3858
 2017-06-30 10:39:22 +02:00
Jaime van Kessel
d38eb7f4e4 Model data is now actually appended to data that's being sent 
CURA-3858
 2017-06-30 10:35:16 +02:00
Jaime van Kessel
5c9e3c1e4d Extruders are now correctly filled in slicdeInfo 
CURA-3858
 2017-06-30 10:30:33 +02:00
Jaime van Kessel
c77ff8ea8b Initial set of changed setup for sliceinfo 
CURA-3858
 2017-06-29 16:54:12 +02:00
Jaime van Kessel
0f00895a97 Code cleanup 
CURA-3858
 2017-06-29 14:57:19 +02:00
Jaime van Kessel
abae2cc28c Moved SliceInfoJob to it's own file 
CURA-3858
 2017-06-29 14:54:49 +02:00
Ghostkeeper
16564b3194
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-28 15:54:27 +02:00
Jaime van Kessel
e9d2434c41 Simplify text generaton for download button 
CURA-3856
 2017-06-28 15:35:13 +02:00
Ghostkeeper
cd4bffb380
Set author to Ultimaker B.V. instead of Ultimaker 
To be consistent with the rest of the plug-ins and with the material files.

Contributes to issue CURA-3857.
 2017-06-28 13:50:37 +02:00
Ghostkeeper
2a593e316b
Close camera upon disconnecting instead of relying on Uranium to do that 
Uranium shouldn't know about no camera.
 2017-06-28 11:51:12 +02:00
Jaime van Kessel
eda6394b34 Merge branch 'mb-fix-layer-view-line-widths' of https://github.com/smartavionics/Cura 2017-06-26 14:22:00 +02:00
Lipu Fei
fe5466872f Merge remote-tracking branch 'upstream/2.6' 2017-06-26 12:59:25 +02:00
Lipu Fei
dc6eef0bc6 Merge pull request #2015 from Ultimaker/fix_override_extruder_settings_with_global_2.6 
fix: copy global settings into extruder msessage for SE (CURA-3930)
 2017-06-26 12:57:39 +02:00
Lipu Fei
bc65cc1102 Fix code style 
CURA-3930
 2017-06-26 12:49:34 +02:00