Tim Kuipers
a01f91d4e3
omit irrelevant log base
2019-10-25 11:16:32 +02:00
Tim Kuipers
76a538322d
simplify formula to make it more numerically stable
2019-10-25 11:16:13 +02:00
Nino van Hooff
8a963a0c4e
Merge remote-tracking branch 'origin/log_litho' into log_litho
...
# Conflicts:
# plugins/ImageReader/ConfigUI.qml
# plugins/ImageReader/ImageReader.py
2019-10-25 10:26:12 +02:00
Nino van Hooff
6e65fe5772
Only show the transmittance input when the color model is Translucency
...
CURA-6540
2019-10-25 09:57:39 +02:00
Tim Kuipers
03f7fab124
lil fix
2019-10-24 17:26:28 +02:00
Tim Kuipers
449ad19822
based transmittance on measurements on print
...
ratio of luminance of 1.4mm thickness to luminance at 0.4mm
2019-10-24 17:26:28 +02:00
Tim Kuipers
5915947a7a
fix litho thickness computation
2019-10-24 17:26:28 +02:00
Tim Kuipers
364483f653
explain litho transmittance better
2019-10-24 17:26:28 +02:00
Tim Kuipers
a8b3d7e49d
make naming of Logarithmic Conversion Function intelligible
2019-10-24 17:26:28 +02:00
Tim Kuipers
2b55b85a12
fix luminance computation
2019-10-24 17:26:28 +02:00
Tim Kuipers
b88183f4a1
fix translucency model using new permittance setting
2019-10-24 17:26:28 +02:00
Tim Kuipers
88b424d36a
feat: use logarithmic conversion for lithophanes
2019-10-24 17:26:28 +02:00
Tim Kuipers
b3d7887d4d
fix luminance computation
2019-10-24 17:26:28 +02:00
Nino van Hooff
2e43f63adb
Merge branch 'master' into log_litho
2019-10-24 15:26:11 +02:00
Jaime van Kessel
de13317b9e
Merge pull request #6101 from iLyngklip/master
...
Create DisplayRemainingTimeOnLCD.py
2019-10-24 15:14:24 +02:00
Ghostkeeper
6e8ed3b605
Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master
2019-10-24 14:29:05 +02:00
Ghostkeeper
867283ffc3
Code style
2019-10-24 13:23:44 +02:00
Ghostkeeper
969b74e1f6
Prevent crash when sync list somehow contains None
...
I couldn't figure out how it could ever contain None, but we received logs from a user that indicate a crash here because that set contains None and that is not orderable. This is a hotfix to fail more gracefully instead of crashing the entire application.
2019-10-24 11:56:08 +02:00
ninovanhooff
b9b086a8c0
Merge pull request #6542 from Ultimaker/CURA-6793_performance
...
Performance improvements
2019-10-23 16:50:04 +02:00
ninovanhooff
f504ef8aef
Merge pull request #6570 from Ultimaker/CURA-6665_api_decorator
...
CURA-6665 Add @api decorator
2019-10-23 15:50:45 +02:00
Nino van Hooff
dd9e6e4abe
Merge branch 'master' into CURA-6665_api_decorator
2019-10-23 15:42:32 +02:00
Nino van Hooff
5436e68ea4
Fix mypy warning
...
CURA-6665
2019-10-23 15:29:54 +02:00
ninovanhooff
9beea85482
Merge pull request #6566 from Ultimaker/CURA-6858_increase_sdk_ver_7_0
...
Change SDK version to 7.0.0
2019-10-23 11:54:49 +02:00
Ghostkeeper
fe70cb23bf
Remove overrides that didn't have any effect
...
This works due to our new test that tests for that case. A common failure case.
2019-10-23 11:01:01 +02:00
Nino van Hooff
a88887dbdb
Change Backup (Drive) plugin version to 7.0
...
CURA-6858
2019-10-23 10:50:04 +02:00
Lipu Fei
08b1e0e9a8
@api checked for semantic versions
...
CURA-6665
2019-10-23 10:34:50 +02:00
Ghostkeeper
94eb76a844
Merge branch 'master' into CURA-6793_performance
...
Conflicts:
cura/Machines/MaterialManager.py -> File was deleted in Master but I changed things for the lazy loading.
cura/Machines/Models/BaseMaterialsModel.py -> I clarified documentation on a line above a place where a timer was added in between.
Contributes to issue CURA-6793.
2019-10-23 09:58:08 +02:00
Lipu Fei
33cf7491ef
dos2unix Decorator.py
...
CURA-6665
2019-10-23 09:58:05 +02:00
Ghostkeeper
aed2346465
Don't sleep for extruder stacks
...
Contributes to issue CURA-6793.
2019-10-23 09:53:22 +02:00
Ghostkeeper
5b70d409ed
Improve documentation for lazy-loading background task
...
In particular the thread switching sleep was a bit mysterious.
Contributes to issue CURA_6793.
2019-10-23 09:46:44 +02:00
Ghostkeeper
f69360fb14
Make lazy-load container a protected inner class
...
Contributes to issue CURA-6793.
2019-10-23 09:42:43 +02:00
Ghostkeeper
f1e35907d2
Make MachineNodeLoadJob protected inner class
...
It should not be used outside of this class.
Contributes to issue CURA-6793.
2019-10-23 09:41:05 +02:00
Ghostkeeper
f3736f0576
Add typing for _machines
...
Contributes to issue CURA-6793.
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2019-10-23 07:40:12 +00:00
Lipu Fei
b2afaf305d
Add @api decorator
...
CURA-6665
2019-10-23 08:33:00 +02:00
Ghostkeeper
59e55dab5e
Fixes for consistency with other printers
...
Contributes to issue CURA-6814.
2019-10-22 17:23:32 +02:00
Ghostkeeper
fa00600655
Merge branch '4.3' of https://github.com/samirabaza/Cura into samirabaza-4.3
2019-10-22 16:58:30 +02:00
Lipu Fei
f2c66f8d3a
Fix TestVariantNode
...
CURA-6921
2019-10-22 15:31:17 +02:00
Lipu Fei
66005f28f3
Fix typo in removing Alternate Skin Rotations
2019-10-22 15:00:51 +02:00
Lipu Fei
66bc20eab1
Revert incorrect material handling code in VariantNode
...
CURA-6921
2019-10-22 14:53:14 +02:00
Lipu Fei
b6d591c64c
Add typing
...
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
1f3a7c976f
Remove deprecated MachineManager.activeMachineHasRemoteConnection
...
CURA-6858
2019-10-22 14:14:14 +02:00
Lipu Fei
38ee4bf208
Remove deprecated functions in MachineManager
...
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
7544d049c5
Remove deprecated ExtruderManager.getExtruderName
...
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
9c92e61699
Remove deprecated getChildNode and getContainer in ContainerNode
...
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
43ee68bdc7
Remove deprecated PrinterOutputDevice.setAcceptsCommands
...
CURA-6858
2019-10-22 14:11:36 +02:00
Lipu Fei
227b76d6f0
Remove deprecated currentExtruderPositions
...
CURA-6858
2019-10-22 14:11:31 +02:00
Ghostkeeper
cb9b385a85
Remove Alternate Skin Rotations setting
...
It's been replaced completely by the Top/Bottom Line Directions setting.
2019-10-22 13:46:42 +02:00
Lipu Fei
fc0b8185b7
Fix setMetaDataEntry() dependency on ContainerRegistery
...
CURA-6920
2019-10-22 11:38:32 +02:00
Ghostkeeper
985aac9e60
Assert that there is no ID metadata entry in definition containers
2019-10-22 11:01:16 +02:00
Ghostkeeper
d561810024
Remove ID metadata fields from definition files
...
They are not being used any more. For some reason people thought that an exception was made for extruders or something. And people keep adding them for the definition files too. I'll add a test to prevent that.
2019-10-22 11:00:49 +02:00