GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,410 Commits 294 Branches 267 Tags
Commit Graph

3410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
49649f4cd8 Mirror Y-axis of head polygon 
Apparently, the machine homes to maximum-Y, so the open end of the machine is on the other side. I'm rotating it 180 degrees.
 2016-06-11 02:51:48 +02:00
Ghostkeeper
6311cea372 Machine head polygon with measured dimensions 
The collision polygon of the machine head is rectangular, but the arm on which the nozzle hangs extends to the edge of the build plate on one side. These measurements were taken also by Calvindog717. The orientation is guessed. Usually the Y+ direction is towards the front... Let's hope it's good!
 2016-06-11 00:57:49 +02:00
Ghostkeeper
b321a8a053 Add definition Printrbot Simple by Calvindog717 
Source: https://www.reddit.com/r/3Dprinting/comments/4n1lyd/cura_212_has_been_released_it_features_major_ui/d409udf
I've converted Calvin's profile that he was using personally to be up to date after the settings rework.
 2016-06-10 23:36:36 +02:00
Ghostkeeper
e8dd67cbde Merge branch 'multiextruder_profiles'. 2016-06-10 17:39:43 +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
Ghostkeeper
d89c9d8827
Make getSelectedActiveExtruder return its misbegotten gains 
It was getting a value from the decorator, then keeping it to itself all greedy like. It must return what it found.

Contributes to issue CURA-340.
 2016-06-10 17:04:26 +02:00
Ghostkeeper
204bf4d7dd
Update visibility of extruder dropdown on change 
It currently only works when switching to a dual-extrusion printer, since the model is not updated when switching away to a non-dual-extrusion printer...

Contributes to issue CURA-340.
 2016-06-10 17:04:26 +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
Tim Kuipers
67058c3d45 fix: definition visibility got borked (CURA-1443) 
machine definition visibility should be a metadata property and should be set to true for only those definitions which are actually machines
 2016-06-10 14:52:15 +02:00
Jaime van Kessel
3cc7549c5f Merge pull request #786 from thopiekar/master 
[master] LayerView: Using resetLayerData()
 2016-06-10 14:33:16 +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
Thomas Karl Pietrowski
7043a04e22 Merge remote-tracking branch 'Ultimaker/master' into master-layerview-use-resetLayerData 2016-06-10 14:05:45 +02:00
Thomas Karl Pietrowski
c0472e0068 LayerView: Using resetLayerData() 
Currently resetLayerData() is not used at all, but found in two places
the same code like found in resetLayerData().
So replaced them with resetLayerData().
 2016-06-10 13:57:52 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Thomas Karl Pietrowski
6c158ba845 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2016-06-10 13:46:25 +02:00
Tim Kuipers
795291a117 fix/feat: introduced and fixed inheritance for all acceleration and jerk settings (CURA-1443) 2016-06-10 13:32:57 +02:00
Tim Kuipers
b2d57207a4 fix: global_only ==> settable_per_X for acceleration and jerk settings (CURA-1560 CURA-1443) 2016-06-10 13:20:55 +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
02d2acd317 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-10 11:48:55 +02:00
Jaime van Kessel
e2e9e7964c Fixed duplication if no name was changed 
CURA-1427
 2016-06-10 11:48:33 +02:00
Ghostkeeper
82aa630b9e Merge pull request #781 from thopiekar/master-ignore-debian-link 
Don't ignore the directory but the link, too.
 2016-06-10 11:42:10 +02:00
Jaime van Kessel
1aa11593fa Merge pull request #785 from thopiekar/master 
Removing unneeded import of 'os'
 2016-06-10 11:21:35 +02:00
Thomas Karl Pietrowski
b61b0a7ee2 Removing unneeded import of os' 2016-06-10 10:52:12 +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 d8e8b0740ac2b1d776c13cd8078fe1b8e4f5a45d.
 2016-06-10 09:17:12 +02:00
fieldOfView
d8e8b0740a Temporarily revert "Renaming profiles now also renames them on disk" 
This reverts commit af238d5a7656b243550c426405e2b356de877365.
 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
fieldOfView
7d2a7bd157 Abbreviate headers 
CURA-1668
 2016-06-09 21:40:07 +02:00
fieldOfView
e25402fc49 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 19:19:00 +02:00
fieldOfView
0d7a7d9299 Update wording to make storing/updating/discarding current settings more clear 
CURA-970
 2016-06-09 19:18:46 +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
598ff1e398
Fix changing active extruder from per-object drop-down 
Apparently this is the way you do it.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +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
Ghostkeeper
f5f711b7dc
On extruder switch create OverrideDecorator if needed 
The SettingOverrideDecorator is only applied if the node has a per-object setting. Now it also creates a decorator also if you've ever switched the extruder, which was needed because the decorator contains the information which extruder to print with.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
Thomas Karl Pietrowski
330481d2d6 Ignore settings set on Eclipse 2016-06-09 18:45:48 +02:00