GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-15 08:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,424 Commits 295 Branches 268 Tags
Commit Graph

7424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Karl Pietrowski
3c4d09464d Merge pull request #790 from thopiekar/master-using-platform 
[master] Using UM.Platform for OS detection
 2016-06-15 15:00:21 +02:00
Thomas Karl Pietrowski
536e0f489a Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform 2016-06-15 14:59:34 +02:00
Thomas Karl Pietrowski
2e7db9b732 Adding check whether getGlobalContainerStack() returns None or not. 
If we get None here, the firmware-updater will be closed and detailed
error returned to the logs with an explanation why.
 2016-06-15 14:38:23 +02:00
Ghostkeeper
7c2c24b8a5
Remove unused function 
Contributes to issue CURA-340.
 2016-06-15 14:38:19 +02:00
Ghostkeeper
cb467f488b
Don't convert ids to lowercase 
Eventually we might have to do this due to case-insensitivity of some file systems, but this is not the place for that anyway.

Contributes to issue CURA-340.
 2016-06-15 14:36:58 +02:00
Jaime van Kessel
7d258485c8 Small fixes so switching printers correctly connects / disconnects output devices 
CURA-1036
 2016-06-15 14:17:59 +02:00
Jaime van Kessel
8b5800c1ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-15 14:14:19 +02:00
Jaime van Kessel
12faf23af8 Added a way to check if a printer is connected 
CURA-1036
 2016-06-15 14:13:54 +02:00
Ghostkeeper
8617f10a46 Merge branch 'materials_test' 2016-06-15 13:58:18 +02:00
Ghostkeeper
85422ae6a5
Make extruder_nr a string value 
It's an enum after all, and the front-end doesn't work well with enums that are ints. The code for the back-end should remain the same.

Contributes to issue CURA-1716.
 2016-06-15 13:52:57 +02:00
Simon Edwards
92569d63e9 Call the method correctly through the instance. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 13:40:41 +02:00
Simon Edwards
70b2311c59 Use the file name to create the profile name during import. Also moved the createUniqueName() method up into CuraContainerRegistry. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 12:51:47 +02:00
Thomas Karl Pietrowski
a7fc3258a7 Only use Application.[...].getGlobalContainerStack() to get all values 2016-06-15 11:16:13 +02:00
fieldOfView
89f64eb870 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-15 11:13:48 +02:00
fieldOfView
2460b37c99 Fix check for self._global_container_stack for consistency 
CURA-340
 2016-06-15 11:13:31 +02:00
Thomas Karl Pietrowski
5128ea41c4 Getting "machine_heated_bed" (hopefully) correctly + little fix 2016-06-15 10:57:58 +02:00
Thomas Karl Pietrowski
253bb5f43c Removing hasHeatedBed from MachineManagerModel again.. 2016-06-15 10:56:01 +02:00
Jaime van Kessel
7176c98d8a Fixed stupid mistake with getting active extruder stack 
CURA-1689
 2016-06-15 10:21:06 +02:00
Thomas Karl Pietrowski
9e6f5a4a68 CURA-1615 - Updating for API 3 
This updates the firmware updater to use the new MachineManagerModel

Additionally renamed "machine_type" to "machine_id", which makes it more
selfexplaining, when reading the code.

My printers firmware is not available here and has no heated bed, so
please test this commit!
 2016-06-15 10:04:47 +02:00
Jaime van Kessel
6a1f4cbabb Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-15 09:50:26 +02:00
Jaime van Kessel
f0340c6d63 Rework based on review 
CURA-1689
 2016-06-15 09:50:05 +02:00
fieldOfView
0864b53081 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-15 09:46:08 +02:00
fieldOfView
61db0a7660 Fix extruder tabs for >2 extruders or long extruder names 
CURA-340
 2016-06-15 09:45:55 +02:00
Jaime van Kessel
1bab4032fd Fixed broken perobject setting panel 
CURA-1725
 2016-06-15 09:41:32 +02:00
Simon Edwards
004a000d51 Corrected the i18n catalog used. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 21:04:51 +02:00
Arjen Hiemstra
e473d7a4e9 Ensure the control has active focus when clicking a SettingItem 
This way we ensure that things update properly when for example changing
infill pattern.

Fixes CURA-1494
 2016-06-14 17:29:05 +02:00
Thomas Karl Pietrowski
11798a0d42 Merge branch 'master' of https://github.com/thopiekar/Cura.git 2016-06-14 17:17:08 +02:00
Tim Kuipers
1291587001 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-06-14 17:06:46 +02:00
Jaime van Kessel
ac4dbe2304 Decreased the progress added when 0 was returned 
Turned out that by adding 0.1, it started at 10%
 2016-06-14 16:01:06 +02:00
Tim Kuipers
13fd588451 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-06-14 15:47:29 +02:00
Jaime van Kessel
cadf5d85b7 Camera image is now also retrieved 
CURA-338
 2016-06-14 13:46:04 +02:00
Jaime van Kessel
1220d32ca5 No longer possible to send print_jobs when print just started 
CURA-49
 2016-06-14 13:23:05 +02:00
Jaime van Kessel
eb836bfc3f Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-14 11:52:04 +02:00
Jaime van Kessel
3777acd4cd Changed order of inheritance. 
Because the python new is stupid, it fails to notice the qObject if it's not defined first
 2016-06-14 11:50:59 +02:00
Jaime van Kessel
1acf155e19 We don't depend on requests lib anymore 
Intead we use qt network stuff for everything.
CURA-49
 2016-06-14 11:49:28 +02:00
Simon Edwards
175b5429b4 Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 11:44:38 +02:00
fieldOfView
c0b31d85fa Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-14 11:06:18 +02:00
fieldOfView
2498e7110d Allow setting the diffuse_color with a uniform binding 
CURA-345
 2016-06-14 11:05:50 +02:00
fieldOfView
7faae685e5 Use different default colors for each extruder 
CURA-340
 2016-06-14 10:58:26 +02:00
fieldOfView
4ece9b0997 Add swatch to extruder tabs 
CURA-340
 2016-06-14 10:42:33 +02:00
fieldOfView
24e165b964 Remove error on ProfilesPage 
CURA-1585
 2016-06-14 10:41:06 +02:00
Jaime van Kessel
486fc7f176 When no globalcontainer is set, no check to connect is performed 
CURA-49
 2016-06-14 09:46:01 +02:00
Jaime van Kessel
18a1239443 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-14 09:43:12 +02:00
Jaime van Kessel
bd413b9a2b Added signalemitter 
CURA-49
 2016-06-14 09:42:53 +02:00
Jaime van Kessel
b429f98d6a Added signalemitter decoration 
CURA-49
 2016-06-14 09:42:05 +02:00
fieldOfView
8f86a19d6b Fix bq_hephestos_xl.def.json to valid json 2016-06-13 22:12:45 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
 2016-06-13 18:23:53 +02:00
fieldOfView
213e20bf4b Enable per object settings for objects inside a group 
CURA-1054
 2016-06-13 16:55:10 +02:00
fieldOfView
33c4e86163 Change abbreviation of "seconds" to IEEE-recommended "s" (instead of "sec") 2016-06-13 16:14:16 +02:00
Jaime van Kessel
025bdba516 Changes to make the network plugin play well with setting_rework 
CURA-49
 2016-06-13 13:34:22 +02:00