3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
3514 commits 307 branches 272 tags 787 MiB
Commit graph

727 commits

Author SHA1 Message Date
Thomas Karl Pietrowski
a9671cdcfd Deleting a backup 
This removes a backup, which I made when switching between git branches.
 2016-06-11 23:00:44 +02:00
Ghostkeeper
e813c2c08e Merge pull request #787 from Ultimaker/exception_handling_fixes 
Minor Exception handling Fixes
 2016-06-11 15:23:16 +02:00
Thomas Karl Pietrowski
b047db36fd Using isLinux() for Linux detection 
Of course there are more places where we can replace these checks.
 2016-06-11 13:43:50 +02:00
Thomas Karl Pietrowski
c38e31f0e3 BuildVolume: Remove worthless line 
Just a small clean up. skirt_size was initialized twice.
 2016-06-11 13:21:52 +02:00
Thomas Karl Pietrowski
41d03536eb Using a save name for variable "property" 
Using "property" here might be not save. Just replaced that variable
with "attribute" and added a reminder, so nobody renames it to
"property" again.
 2016-06-11 13:16:40 +02:00
Thomas Karl Pietrowski
0d8292df49 Using platform.system() for Windows detection 
This is just cosmetics. It works the same as system.platform, but looks
better. Additionally "win32" might be misleading, as it sounds like we
are checking for Windows 32bit here.
 2016-06-11 12:50:28 +02:00
Jaime van Kessel
cc17c28978 Fixed global stack not being set as next stack for extruder trains 2016-06-10 17:26:09 +02:00
Jaime van Kessel
8c43d4c4cb Quality is now set for extruder, regardless if the machine has machine specific qualities 2016-06-10 17:04:25 +02:00
Jaime van Kessel
fa72630c0a Merge branch 'multiextruder_profiles' of github.com:Ultimaker/Cura into multiextruder_profiles 2016-06-10 16:54:24 +02:00
Jaime van Kessel
9626cddf34 Extruder trains are now correctly saved 2016-06-10 16:53:59 +02:00
fieldOfView
e150b1887e Update active variant, material and quality id when switching extruders 
CURA-1585
 2016-06-10 16:50:11 +02:00
fieldOfView
57dfc2ae79 Change active containerstack when the global containerstack is changed 
CURA-1585
 2016-06-10 16:37:43 +02:00
fieldOfView
c4a1bd2fd3 Automatically use global- or extruder- containerstack 
CURA-1585
 2016-06-10 16:13:47 +02:00
Jaime van Kessel
717b9574b9 Merge branch 'feature_accelerations_and_jerk_per_feature_settigns_rework' of github.com:Ultimaker/Cura 2016-06-10 15:36:31 +02:00
Arjen Hiemstra
a4e37d9ae7 Mark certain types of exceptions as fatal and abort the application if they occur 
We simply cannot recover properly from things like an uncaught
MemoryError since that usually means any follow up operation will also
fail. So Instead of silently ignoring it and having the application in a
broken state we properly abort.

Right now the list of fatal exceptions is a bare minimum that contains
the most prominent things we cannot recover from.
 2016-06-10 15:08:16 +02:00
Arjen Hiemstra
44f8744c84 Use the Logger to report uncaught exceptions 
Makes for a nicer and clearer output of uncaught exceptions
 2016-06-10 14:56:08 +02:00
Tim Kuipers
78fbb988cf Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 14:56:03 +02:00
Arjen Hiemstra
0aea7bdb5c Use callLater to set the active machine in MachineManager 
This prevents exceptions in setActiveMachine from preventing Cura to
start.
 2016-06-10 14:54:21 +02:00
Ghostkeeper
f302e06654
Reslice when per-object extruder changes 
Not when you activate the dropdown but it doesn't change though.

Contributes to issue CURA-340.
 2016-06-10 14:24:21 +02:00
Ghostkeeper
df1ca39c7b
Fix getting proper container stack in decorator 
Using the filter function now but the resulting list wasn't properly accounted for.

Contributes to issue CURA-340.
 2016-06-10 14:24:21 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Jaime van Kessel
179b6eeaac Fixed issue where not having a machine caused extruder retrieval to fail 
CURA-1689
 2016-06-10 13:16:54 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
Jaime van Kessel
9672b3360c Changing settings in extruder stack now also triggers reslice 
CURA-1689
 2016-06-10 12:26:11 +02:00
Jaime van Kessel
e2e9e7964c Fixed duplication if no name was changed 
CURA-1427
 2016-06-10 11:48:33 +02:00
Jaime van Kessel
0cf3fd3624 Removed unused imports 
CURA-1278
 2016-06-10 09:41:51 +02:00
Jaime van Kessel
962b4e84a9 Fixed renaming of profiles. 
They are now correctly renamed (and saved under different name on disk as well)

CURA-1683
 2016-06-10 09:38:47 +02:00
Jaime van Kessel
070a522abb Revert "Temporarily revert "Renaming profiles now also renames them on disk"" 
Starting work on it again, so unreverting the revert (i guess)

This reverts commit d8e8b0740a.
 2016-06-10 09:17:12 +02:00
fieldOfView
d8e8b0740a Temporarily revert "Renaming profiles now also renames them on disk" 
This reverts commit af238d5a76.
 2016-06-10 00:12:35 +02:00
fieldOfView
2287c2daa6 Show that a value is being calculated instead of showing "QVariant..." 
CURA-1668
 2016-06-09 21:40:53 +02:00
Jaime van Kessel
ceef6a003e Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-09 19:17:57 +02:00
Jaime van Kessel
af238d5a76 Renaming profiles now also renames them on disk 
CURA-1683
 2016-06-09 19:17:31 +02:00
Ghostkeeper
9e86cd5c85
Fix call to findContainerStack[s] 
Was a typo. Now it also checks if the stack ID is correct here. Not because it went wrong, but for defensive programming.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
fieldOfView
d34d398e96 Change the implementation of creating a profile from the current settings 
The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
 2016-06-09 18:40:42 +02:00
Ghostkeeper
3206650f39
Fix signal, repair per-object settings 
This was the wrong type of signal, which gave an error.

Contributes to issue CURA-340.
 2016-06-09 17:05:21 +02:00
Ghostkeeper
9f3752276f
Fix check if machine's extruders are processed 
Luckily this did never occur anyway since the rest of the code was sound.

Contributes to issue CURA-340.
 2016-06-09 17:05:21 +02:00
Ghostkeeper
9d618282ed
Save default material colour statically 
So if you wish to change that colour, you only need to change it in one place.

Contributes to issue CURA-340.
 2016-06-09 17:01:21 +02:00
Jaime van Kessel
e793ce1a2c Use ID instead of definition 2016-06-09 16:57:40 +02:00
fieldOfView
d31153cdbb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 16:55:17 +02:00
fieldOfView
392d237b47 Fix filtering UM2+ profiles 
Profiles did not show before selecting a material
CURA-1278
 2016-06-09 16:55:04 +02:00
Jaime van Kessel
1db74b00fd Merge branch 'feature_send_extruder_settings' of github.com:Ultimaker/Cura 2016-06-09 16:41:22 +02:00
Ghostkeeper
bd76c3e30f
Add drop-down in per-object settings to select extruder 
Actually selecting an extruder has no effect because there are dragons in that area and I need better armour with bonus damage against bugs before I venture in there.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 15:47:06 +02:00
Tim Kuipers
12a7b99cf7 fix: merge b3cfa62 went wrong, no slicing happened (CURA-1558) 2016-06-09 15:43:18 +02:00
Simon Edwards
97d64a0749 Move ProfileReader and ProfileWriter over to Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-09 14:14:49 +02:00
Simon Edwards
c03588c6e5 Profile export now goes via the plugin system, and does the same filename checks as before. 
Contributed to CURA-1667 Profile import/export
 2016-06-09 14:14:48 +02:00
Arjen Hiemstra
d57e2b2e22 Add an ID role and addGlobal property to ExtrudersModel 
Contributes to CURA-340
 2016-06-09 13:47:34 +02:00
Arjen Hiemstra
627d5e3c0d Merge branch 'master' of github.com:ultimaker/Cura 
* 'master' of github.com:ultimaker/Cura:
  Determine readonly state from location in filesystem instead of a metadata property
  Change focus upon extruder switch
  Fix extruder number attached to extruders
  Fix duplicating the first item on the Profiles page
  Fix spelling
  Document setActiveExtruderIndex
  Inheritance button now works if instance containers contain functions
  JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560)
  feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally for fdmextruder settings (CURA-1558)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally (CURA-1558)
 2016-06-09 13:31:08 +02:00
Arjen Hiemstra
8729dce531 Store the actual extruder stack in ExtruderManager instead of just the ID 
Contributes to CURA-340
 2016-06-09 13:30:17 +02:00
fieldOfView
f498f0237c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 13:16:38 +02:00
fieldOfView
cd803bc36e Determine readonly state from location in filesystem instead of a metadata property 
CURA-1684
 2016-06-09 13:16:23 +02:00