Commit graph

12848 commits

Author SHA1 Message Date
fieldOfView
cdd38763f6 Tweak sidebar tab bar appearance
CURA-1036
2016-06-22 16:06:11 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages
CURA-1385
2016-06-22 15:35:44 +02:00
Jaime van Kessel
b62118dc1c Added supported actions to all UM machines
CURA-1385
2016-06-22 15:29:54 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run
CURA-1385
2016-06-22 14:39:41 +02:00
fieldOfView
1c83b15290 Tweak viewport overlay
Change color, opacity. Block mouseclicks.
CURA-1036
2016-06-22 14:22:35 +02:00
Tim Kuipers
b22d65c369 Merge branch 'master' into feature_zhop_over_other_material 2016-06-22 13:25:50 +02:00
Jaime van Kessel
4ad7731efd Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-22 12:45:29 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled
CURA-1385
2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency"
This reverts commit 963a2092ef.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
2016-06-22 10:19:44 +02:00
fieldOfView
b17d621243 Disable nozzle/material selection on the global tab
The global tab has no nozzle/material by definition.
CURA-333
2016-06-22 09:55:25 +02:00
fieldOfView
6fa1fb9d2f Select "Global" tab when switching to a machine that has multiple extruders.
CURA-333
2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
2016-06-22 09:55:23 +02:00
fieldOfView
92905ada34 Show true extrudernames in Simple Mode support extruder selection combobox
CURA-333
2016-06-22 09:55:21 +02:00
fieldOfView
eba2451cf2 Add tooltip to extruder-tabs
CURA-333
2016-06-22 09:55:21 +02:00
fieldOfView
d0626f8c8a Add hypothetical multiextrusion printer to test 2016-06-22 09:55:19 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed
CURA-1385
2016-06-21 16:19:44 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible
CURA-1385
2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action
CURA-1385
2016-06-21 13:30:36 +02:00
Ghostkeeper
63edd6f74d
Improve default raft settings
Results from materials testing.
2016-06-21 12:57:33 +02:00
Jaime van Kessel
3342f2a76a Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-20 13:52:11 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages
CURA-1385
2016-06-20 13:46:05 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
2016-06-20 12:00:56 +02:00
Tim Kuipers
0f92f78916 JSON fix: z hop inheritance functions and default value (CURA-1506) 2016-06-17 17:26:23 +02:00
Tim Kuipers
611c88c630 JSON fix: lil indent (CURA-1506) 2016-06-17 16:52:04 +02:00
Tim Kuipers
94dcacb27e JSON feat: Z Hop only over printed parts and Z Hop Enable (CURA-1506) 2016-06-17 16:51:37 +02:00
Tim Kuipers
db3d568c76 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-17 16:31:22 +02:00
Jaime van Kessel
96e6477793 Print monitoring tab now has icons indicated if it's paused / connected
CURA-1036
2016-06-17 13:06:33 +02:00
Jaime van Kessel
1232ac7df5 Temperatures are now rounded + displayed with celcius sign
CURA-1036
2016-06-17 12:05:23 +02:00
Jaime van Kessel
1f9acf0b54 Color of progress bar now changes based on jobstate
CURA-1036
2016-06-17 12:01:48 +02:00
Jaime van Kessel
ef9ce7ad55 Made time total & time remaining pretty
CURA-1036
2016-06-17 11:55:53 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
Jaime van Kessel
168246d594 Added progress percentage label
CURA-1036
2016-06-17 11:02:22 +02:00
Jaime van Kessel
ec34d92500 Resume, pause & abort are handled correctly
CURA-1036
2016-06-16 17:47:05 +02:00
Jaime van Kessel
74c4774092 Fixed print /resume button
CURA-1036
2016-06-16 17:21:16 +02:00
Jaime van Kessel
8d8b479216 Adding pause / resume buttons for print monitoring
CURA-1036
2016-06-16 15:36:51 +02:00
Ghostkeeper
60d6cc07fb
Add Mendel90 by Bo Herrmannsen
Provided via https://github.com/Ultimaker/Cura/issues/808
2016-06-16 13:17:41 +02:00
Jaime van Kessel
a735e92dfa Added camera image overlay when monitoring print
CURA-1036
2016-06-16 11:01:58 +02:00
Jaime van Kessel
3a46bb8d8a Added CameraImageProvider & camera handling
CURA-1036 and CURA-338
2016-06-16 09:34:43 +02:00
Jaime van Kessel
8160f8d5e6 Added more data to the print monitor screen
CURA-1068
2016-06-15 16:47:19 +02:00
Jaime van Kessel
8a603c2fc1 Added basic tabs for monitoring print
CURA-1036
2016-06-15 16:17:52 +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
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
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
Tim Kuipers
1291587001 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-06-14 17:06:46 +02:00
Tim Kuipers
13fd588451 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-06-14 15:47:29 +02:00