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

5951 Commits

Author SHA1 Message Date
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
Thomas Karl Pietrowski
dbe1d140c4 Removing old function 2016-08-07 08:54:58 +02:00
Thomas Karl Pietrowski
e5ff77bc5c Showing less traceinfo 2016-08-07 08:17:31 +02:00
Thomas Karl Pietrowski
8e92cb4c91 CURA-1923: Don't return a complete traceback on HTTPError 
As discussed on GitHub we don't need a complete traceback on HTTPError.
However URLError should return a full traceback, like any other
exception that might occur.
 2016-08-07 08:16:22 +02:00
Thomas Karl Pietrowski
7c6df5a485 Merge branch 'master' of https://github.com/Ultimaker/Cura.git into master-CURA-1923 2016-08-06 20:32:27 +02:00
Ghostkeeper
021a33d6bd
Always set value of added setting instance 
The value property was sometimes not set. In the default case, this just added an empty setting instance (for a particular key), which appeared to do nothing until you've changed it. This appears correct because if it's not changed then it should be the same as the extruder's value, but if you then change the extruder's value it doesn't update its visible value but still has no value in the setting instance, so the value still falls back to the extruder and the setting ends up different from what is being displayed.

Contributes to issue CURA-1988.
 2016-08-05 17:30:22 +02:00
fieldOfView
ea3e2225ed Don't pass support_angle to shader unless it is valid 
CURA-2058
 2016-08-05 15:23:47 +02:00
Ghostkeeper
51d972941e
Handle rounding errors in stack_nr 
Wouldn't want it to index extruder '1.0'.

Contributes to issue CURA-2067.
 2016-08-05 12:05:01 +02:00
Ghostkeeper
92b154f5fe
More defensive check for global_inherits_stack extruder 
This should never give the keyerror any more and always default back to non-global_inherits_stack mode.

Contributes to issue CURA-2067.
 2016-08-05 11:59:32 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value. 
Contributes to CURA-2007
 2016-08-04 14:30:48 +02:00
Ghostkeeper
de7f32da19
Convert global_inherits_stack to int before slicing 
Sometimes it was accidentally converted to a float when it passes through Javascript.

Contributes to issue CURA-2055.
 2016-08-04 13:25:51 +02:00
Ghostkeeper
ee95e90b4b
Fix display update bug in per-object panel 
Setting .value creates a new Python attribute in the object. Setting with setProperty creates the setting property, like we wanted.

Contributes to issue CURA-2011.
 2016-08-04 12:36:33 +02:00
Ghostkeeper
d97c9f6e4c
Don't use extruder fallback on single-extrusion machines 
Due to a gnawing feeling in the back of my head, I tested this with an UM2 and adding settings failed there. This fixes it.

Contributes to issue CURA-2011.
 2016-08-04 11:36:45 +02:00
Ghostkeeper
eeec460635 Merge branch 'feature_support_bottoms' 2016-08-03 17:40:28 +02:00
Ghostkeeper
df1b6b8e88
Only get from extruder if global_inherits_stack is valid 
Sometimes it is set to give -1 for some settings.

Contributes to issue CURA-2040.
 2016-08-03 10:27:17 +02:00
Ghostkeeper
f568014e67
Add setting with value from support extruder stack 
Upon adding the setting (making it visible) it takes the setting from the support extruder stack. It doesn't update afterwards.

Contributes to issue CURA-2011.
 2016-08-02 16:49:38 +02:00
Ghostkeeper
5bd3d83c9e
Fix typos in documentation 
Contributes to issue CURA-2011.
 2016-08-02 16:49:38 +02:00
Arjen Hiemstra
0f1c59c925 Properly catch when either extruder or global quality is not properly set 
Cornercase, but it avoids bubbling odd error messages to the UI.

Fixes CURA-1997
 2016-08-02 15:20:03 +02:00
Arjen Hiemstra
b97b694f41 Force recreating the socket when using external-backend 
This may recreate the socket with a new port number but at least it
recreates the socket now.

Partially fixes CURA-1877
 2016-08-02 13:58:16 +02:00
Tim Kuipers
401e302ad5 Merge branch 'master' into feature_support_bottoms 2016-08-02 12:46:44 +02:00