Jack Ha
2f7644c34e
Travel moves are now flat planes, on top of the 'tubes'. CURA-3273
2017-02-21 10:00:29 +01:00
Jack Ha
ed2b0de224
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-20 15:56:47 +01:00
Jack Ha
24d04558f0
Merged LayerView show_adhesion and show_support into show_helpers. CURA-3273
2017-02-20 15:56:29 +01:00
Jaime van Kessel
88bbadead8
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-20 09:58:24 +01:00
Jack Ha
e82bb29e1d
Revert translation of listmodel text. CURA-3273
2017-02-20 09:57:25 +01:00
Jaime van Kessel
ff3b3f30b5
Merge branch 'master' of https://github.com/ruimartinsptl/Cura
2017-02-20 09:56:55 +01:00
Jack Ha
fd2525768d
Capitalized labels, made them translatable. CURA-3273
2017-02-20 09:55:07 +01:00
Jack Ha
cd54552498
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-20 09:45:51 +01:00
Jack Ha
b229d38a88
LayerView checkboxes are not remembered; added switching Legend on for compatibility mode. CURA-3273
2017-02-20 09:45:37 +01:00
Rui Filipe de Sousa Martins
0a5e279a9f
Printer helloBEEprusa added.
2017-02-18 16:15:56 +00:00
Jaime van Kessel
3bbbd4a692
Merge branch 'fix_window_overflow' of https://github.com/fieldOfView/Cura
2017-02-17 15:31:10 +01:00
Jaime van Kessel
905f57cd63
Merge branch 'fix_compatibility_mode_legend' of https://github.com/fieldOfView/Cura
2017-02-17 15:28:40 +01:00
Jaime van Kessel
8e05ba46a6
Merge branch 'fix_slot_property_confusion' of https://github.com/fieldOfView/Cura
2017-02-17 15:26:40 +01:00
fieldOfView
04ab33b913
Fix legend in compatibility mode
2017-02-17 14:07:19 +01:00
fieldOfView
9254ac1694
Add libSavitar credit
2017-02-17 13:44:43 +01:00
fieldOfView
11e9a4cdf4
Make About window scrollable
...
On some OSes/configurations/screens, the list of credits in the About window doesn't fit until the window is resized. Adding a scrollview helps in these cases.
2017-02-17 13:41:39 +01:00
fieldOfView
97d20b4242
Make General preference pane scrollable
...
On some OSes/configurations/screens, the options on the General pane don't fit until the window is resized. Adding a scrollview helps in these cases.
2017-02-17 13:39:46 +01:00
fieldOfView
9229027001
Refactor properties that start with 'get' to avoid confusion between slots & properties
...
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Ghostkeeper
83b290b8d3
Use full import path for parent class
...
Something seems off with the build for some reason. I'm trying to fix it this way.
2017-02-17 12:42:11 +01:00
Ghostkeeper
cec3eebace
Replace list-to-set cast with normal set literal
...
Don't know who did this but he did wrong, yo.
2017-02-17 10:16:11 +01:00
Jack Ha
bb030c724b
Fixed layerview extruder choice checkboxes. CURA-3273
2017-02-16 15:56:37 +01:00
Ghostkeeper
c67ec7f8ab
Merge branch 'nallath-folgertech_FT-5'
2017-02-16 15:28:38 +01:00
Ghostkeeper
fa2c141ec4
Merge branch 'folgertech_FT-5' of https://github.com/nallath/Cura into nallath-folgertech_FT-5
2017-02-16 15:26:54 +01:00
Ghostkeeper
f956436c32
Align tooltips better
...
We want the tooltip area to point at the vertical centre. However, we want the tooltip of pure text elements to point at the vertical centre between the base line and the middle line (centre of lowercase letters). Therefore the offset for those elements is a quarter of the height rather than half (which is good enough of an approximation).
Contributes to issue CURA-3161.
2017-02-16 15:02:48 +01:00
Ghostkeeper
b77e5f5d0c
Fix border colour hovering of preheat temperature input
...
The ID was wrong.
Contributes to issue CURA-3161.
2017-02-16 14:47:47 +01:00
Ghostkeeper
67b72ee6df
Add tooltips for elements of extruder box
...
All things that need a tooltip now have their tooltip. The tooltips don't seem to align well though.
Contributes to issue CURA-3161.
2017-02-16 14:46:15 +01:00
Ghostkeeper
3d8afa9deb
Add tooltip for target bed temperature
...
Contributes to issue CURA-3161.
2017-02-16 14:36:40 +01:00
Ghostkeeper
739775421a
Add tooltip for current bed temperature
...
Contributes to issue CURA-3161.
2017-02-16 14:34:16 +01:00
Ghostkeeper
e142f51e12
Add tooltip for pre-heat input field
...
Just to clarify what you need to put there.
Contributes to issue CURA-3161.
2017-02-16 14:30:19 +01:00
Ghostkeeper
c7793238f7
Disallow pre-heat temperature of 0 explicitly
...
Because that signals to the printer that it should cancel pre-heating.
Contributes to issue CURA-3161.
2017-02-16 14:20:35 +01:00
Ghostkeeper
253b4bce03
Don't disable pre-heat text if temperature is invalid
...
Otherwise you can't change the temperature to make it valid again...
Contributes to issue CURA-3161.
2017-02-16 14:17:13 +01:00
Ghostkeeper
84f695821d
Disable text field when pre-heat button is disabled
...
More consistent user experience.
Contributes to issue CURA-3161.
2017-02-16 14:01:42 +01:00
Ghostkeeper
9a480ac041
Change description of temperature settings to prevent confusion
...
The term 'pre-heat' is now reserved for the actual pre-heating functionality.
Contributes to issue CURA-3161.
2017-02-16 13:55:09 +01:00
Ghostkeeper
2498ee9726
Also disable pre-heat if printer is paused or pausing
...
The UM3 also doesn't allow pre-heating during this period. Other printers tend to keep the bed hot during pausing.
Contributes to issue CURA-3161.
2017-02-16 13:37:44 +01:00
Ghostkeeper
abf092512a
Don't show temperature if print core is removed in UM3
...
The empty string as hotend ID is interpreted as there being no hotend, since this is what the UM3 returns in that case.
Contributes to issue CURA-3161.
2017-02-16 13:23:20 +01:00
Ghostkeeper
140d5204c3
Fix error message when not connected in preheatUpdateTimer
...
Can't get preheatBedRemainingTime from null.
Contributes to issue CURA-3161.
2017-02-16 12:58:40 +01:00
Ghostkeeper
b002e367e3
Only update bed temperature on switching to tab
...
The problem was that the bed temperature for pre-heat was being updated when focus was lost. It now only updates on component being completed. Since print monitor is a component that is switched out with a Loader, it is completed every time the monitor tab is clicked, thus causing this update. It is not pretty to be dependent on this, but it's quite practical considering the alternatives.
This causes the pre-heat temperature to not update when you switch machines. Whether this is desirable or not is up for debate. In any case the bed temperature is now always equal for all machines so it doesn't matter anyway.
Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
d2fa6dbae2
Notify to update remaining time when it drastically changes
...
When the time passes normally it doesn't trigger this signal but just go on counting, but when the pre-heat starts or cancels it updates via this signal. This is handy for the future, when we want to update the remaining time from the printer information. However for now it is also nice because we can make the pre-heat timer dependent on this signal so we know when to have it running. This fixes the problem that the pre-heat seems to have been cancelled in the GUI when you switch away the tab, because the timer running is now dependent on the property rather than always false.
Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
9a5b355f2b
Make countdown visibility dependent on its own text
...
No need to 'update' that in the update timer. We can just link it and it updates on its own.
Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
d363736fdd
Rename preheatCountdownTimer to preheatUpdateTimer
...
It is a timer that triggers every 100ms to update the state of the pre-heating process, after all.
Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
3cc11ecae5
Log when pre-heating or cancelling pre-heat
...
To help debugging and because it's a user interaction.
Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
75a50b73c2
Move pre-heat timer into PrinterOutputDevice
...
If it's held inside the device that has two advantages: It's being held per-device, so switching connection doesn't stop the timer. And also, the logic is no longer in the GUI.
Contributes to issue CURA-3161.
2017-02-16 12:58:32 +01:00
Simon Edwards
2f89a1cff4
Small fix for a regression in the ThreeMFWriter from the recent type hint merge.
2017-02-16 10:20:44 +01:00
Jaime van Kessel
b34bb26a1a
Fixed broken getInstance caused by refactor
2017-02-15 13:51:53 +01:00
Jaime van Kessel
b187cf89a5
Fixed broken logging
2017-02-15 13:50:02 +01:00
Jack Ha
aab17608ff
Fixed shader bugs, lines are now nice and smooth again. CURA-3273
2017-02-15 11:53:20 +01:00
Jack Ha
ce226ebbea
Fix layerview checkboxes. CURA-3273
2017-02-15 11:35:49 +01:00
jack
8fc88f763b
Merge pull request #1288 from Ultimaker/layer_view3_cleanup
...
Layer View 3D, with detection of OpenGL context versions.
2017-02-15 11:11:42 +01:00
Jack Ha
78de5412a2
Merge branch 'master' into layer_view3_cleanup
2017-02-15 10:57:24 +01:00
Jack Ha
9e973732f5
Fixed remember coloring type in Layer View. CURA-3273
2017-02-15 10:50:21 +01:00
