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

1520 Commits

Author SHA1 Message Date
fieldOfView
42549df1f1 Fix setting the printhead polygon 2016-08-16 21:02:30 +02:00
fieldOfView
9b048efe22 Fixed copyrights 2016-08-16 18:19:25 +02:00
Thomas Karl Pietrowski
0435706736 CURA-2079: Adding error messages to the firmware update dialog 
Adds messages for IO errors, communication errors, missing firmware and
a general message for unknown problems.
 2016-08-16 12:25:55 +02:00
Thomas Karl Pietrowski
9a34f6b067 CURA-2079: First concept 2016-08-16 11:36:13 +02:00
fieldOfView
7d37cbd5d2 Merge branch 'master' into feature_machinesettings 2016-08-15 16:07:53 +02:00
fieldOfView
9e7e469df8 Move plugin files into main repo location 2016-08-15 16:06:34 +02:00
fieldOfView
dbaa6190be Add firmware upload for umo_dual 
CURA-1774
 2016-08-15 13:43:16 +02:00
Aldo Hoeben
db4a198a1c Merge pull request #922 from thopiekar/master-CURA-2079 
CURA-2079: Finish firmware upload process on errors
 2016-08-15 12:22:00 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology 
Update UI texts to be compliant to Ultimaker dictionary
 2016-08-15 11:35:19 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Thomas Karl Pietrowski
8179fabf1d Merge remote-tracking branch 'upstream/master' into master-CURA-2079 2016-08-14 17:43:26 +02:00
Thomas Karl Pietrowski
f915092f83 CURA-2079: Finish firmware upload process on errors 
Looking at the old code shows that the download process was never
completely finished. The according function was only return'ed, but no
signal was emitted to the window to give the user the possibility to
close it again.

Optionally, it would be useful here to pass messages to the window
dialog to inform the user about problems.

However, this code is untested because:
1. I don't know where put my printers *.hex-file, when coding here with
my editor,
2. Have no idea how to reproduce the IO errors reported at JIRA, so
fingers crossed here.

Contributes to CURA-2079
 2016-08-14 17:37:36 +02:00
fieldOfView
5c63e5e13f Fix a typo in a comment 
CURA-2113
 2016-08-11 17:18:43 +02:00
fieldOfView
2a55bba840 Code-style fixes 
CURA-2079
 2016-08-11 16:58:02 +02:00
fieldOfView
b619b68675 Remove repeated header between versions in changelog 
CURA-2056
 2016-08-11 16:51:48 +02:00
fieldOfView
c95cc7a21b Fix error in SolidView when there is a model but no printer 2016-08-11 16:44:19 +02:00
fieldOfView
db028b7e5f Update "Select Settings dialog" when the user removes a setting 
CURA-2102
 2016-08-11 15:10:30 +02:00
Jaime van Kessel
91dfd971ca PerObject settings don't automatically get a user changed state 
CURA-2113
 2016-08-11 14:57:21 +02:00
fieldOfView
85a58a22cb Change "Bed"/"Platform" to "Build Plate" 
UXD-76
 2016-08-10 17:57:05 +02:00
fieldOfView
2963a64fc2 Change "Bed Temperature" to "Build Plate Temperature" 
UXD-80
 2016-08-10 17:55:52 +02:00
fieldOfView
7aab8ad397 Change "object" to "model" 
UXD-83
 2016-08-10 17:55:51 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials 
CURA-1971
 2016-08-10 14:37:59 +02:00
fieldOfView
a0203905b6 Show the right material color for single-extrusion machines 
CURA-1992
 2016-08-10 14:08:58 +02:00
Jack Ha
48792aa8f3 Fixed firmware update screen. CURA-2079. 2016-08-10 12:57:01 +02:00
Jack Ha
9bf4dbd24f Fix wrong variable name 2016-08-10 09:44:27 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:43:09 +02:00
Ghostkeeper
a0df0c76de
Use correct material profile in extruder stack 
The material profile is more specific inside a material profile if the machine has material quality profiles.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
4d13622a6e
Split profiles also per variant 
But of course the variant names are strange in the new material profiles.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
9c7a28fa2d
Don't break if current settings machine is unknown 
Currently it sets the user profile to 'empty', which is bad because empty is read-only. But it allows me to continue for now. I'll find a solution for that later.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
36b027b290
Fix copying ConfigParser 
Turns out that copy.copy() doesn't work on ConfigParsers. It returns a different instance but modifying that instance still modifies the old configs. Deep copy isn't allowed. But this dictionary copy works.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
71505a8b35
Use normal config only if not material(-specific) profile 
Other profiles should just return an array with only their single profile.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
9a555fcab0
Fix call to VersionUpgrade21to22.machinesWithMachineQuality 
It needs that stupidly long path if we're using imports inside a plug-in.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
1428f67798
Rename machines_with_machine_quality to machinesWithMachineQuality 
As per the code style conventions. Sorry, I'm used to other conventions in one of my own projects.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
36f84017cf
Move _machines_with_machine_quality to VersionUpgrade21to22 
It's going to need to be used by the upgrader of machine instances as well, that's why.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
7481f0802e
Split profiles into multiple if new printer has material profiles 
If the old profile didn't specify any material, it would be global. But if the new machine specifies that its profiles are material-specific, these profiles have to be split into multiple profiles in order to be able to show them in Cura 2.2.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
af86375ba3
Output arrays of files rather than a single file 
This is needed because the version upgrade system now allows for a version upgrader to output any number of files.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
fieldOfView
c7a120edd5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-09 09:56:40 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Jaime van Kessel
87a0543d0c Added bit more logging to USBConnection 
This should make the debugging easier out in the field.
 2016-08-09 09:37:31 +02:00
fieldOfView
2c61fe3249 Tweak layout of Per Object Settings 
CURA-1799
 2016-08-08 15:41:20 +02:00
fieldOfView
ca2daae6ab Add a "show all" toggle to the select per object setting window 
This way the user can add a setting that is not made visible in the sidebar. Adding a specific setting no longer needs a detour through the setting visibility preference page.

CURA-1799
 2016-08-08 15:11:38 +02:00
fieldOfView
36abe075cf Restyle categories in add per object settings visibility dialog 
... to match the Setting Visibility preference page
CURA-1799
 2016-08-08 14:24:38 +02:00
fieldOfView
7020fd6903 Allow adding multiple per object settings at once 
This reuses the "GUI pattern" of the main setting visibility page.
CURA-1799
 2016-08-08 14:23:39 +02:00
fieldOfView
7326d77605 Fix broken backend plugin on Windows 2016-08-08 12:30:47 +02:00
fieldOfView
6ab3939f75 Fix broken backend plugin on Windows 2016-08-08 12:12:06 +02:00
Thomas Karl Pietrowski
9bd59a4eaa Merge pull request #901 from thopiekar/master-linux-fallback-path 
Scanning for CuraEngine and stop if it was not found
 2016-08-08 10:47:49 +02:00
Thomas Karl Pietrowski
42db29d86a Removing the stray @awhiemstra mentioned 2016-08-08 10:47:19 +02:00
Thomas Karl Pietrowski
7c3b6814d0 Removing strays 2016-08-08 10:45:41 +02:00
fieldOfView
4de5360ac5 Use Logger.log instead of Logger.logException 
CURA-1923
 2016-08-08 10:43:48 +02:00
Thomas Karl Pietrowski
ecd80974f7 CURA-1923: Just something I missed 
Forgot to remove 'self' from 'super().__init__()'
 2016-08-07 09:04:24 +02:00