Commit graph

15578 commits

Author SHA1 Message Date
Ghostkeeper
88a84f60e0
Make estimated_exec_time_in_ms just public
We're all adults here.
We need to modify this property in the fifth pass of move commands.

Contributes to issue CURA-5561.
2018-09-05 16:08:51 +02:00
Ghostkeeper
9a43ee4629
Fix kernel parameters
We did one the wrong way around and weren't safe enough with the other.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
2cc3a593ef
Store current feedrate when encountering it
Otherwise the feedrate is zero and we get divisions by zero.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
df8ee1928d
Fix parsing from value_dict
These are strings, not float. We must convert them.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
169b59a6b4
Remove superfluous _distance_in_mm property
It was only used for printing and not set correctly any more.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
b95ad2f926
Remove unused function
It was empty and unused. I don't know what or why.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
9d6b184cff
Leave out all commands which do nothing to time estimates
Just skip over them.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
cf5f66db9f
Align expected time of auxillary commands to what CuraEngine estimates
CuraEngine doesn't take most of these into its time estimate at all so they can just be 0.

Contributes to issue CURA-5561.
2018-09-05 16:08:50 +02:00
Ghostkeeper
bddfe44f2c
Make G10 and G11 behave just like actual retractions
That's what CuraEngine does anyway.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
4e7f8a268f
Implement calculating final time of movement commands
This includes accelerations, jerks, proper joints, all that sort of thing.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
515b286230
Implement recalculation of trapezoid if entry speed had changed
The fourth pass. It's a lot of work.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
944bf70eb5
Implement forward kernel pass
Copied from CuraEngine's C++ implementation.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
0ad644386e
Actually execute the reverse pass in reverse
As it should.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
5e85af30de
Implement reverse kernel
Taken from CuraEngine's implementation.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
dcbe832d9f
Implement the rest of the initial time estimation
This doesn't complete this task yet because we are still not outputting a correct time estimation for these commands. We're not outputting anything at all actually. We now need to implement the second pass (but only for G1 and G0).

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
1037b09188
Implement M203, setting maximum Z feedrate
It's important.

Contributes to issue CURA-5561.
2018-09-05 16:08:49 +02:00
Ghostkeeper
5d292e1a79
Remove state class usage
This is an effort to synchronize the working of this script with how CuraEngine's time estimation works. This includes tracking only one value for acceleration and multiple Jerk stuff, that sort of thing. We need to ensure it's exactly the same.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Ghostkeeper
c559763c88
Partially implement acceleration and jerk estimation algorithm
This stuff is complex and I hardly understand it. It's basically just a translation of the C++ code in the engine.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Ghostkeeper
5bf90df6be
Rename process() to parse()
Because we need to execute several other processing steps as well.
This parse function for G0 and G1 now needs to initialise the state in the same way as how Block is initialised in CuraEngine.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Ghostkeeper
594e3c986d
Add function to calculate trapezoid for block
Also copied from CuraEngine's implementation.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Ghostkeeper
582f06dfff
Add fields from CuraEngine
The idea of this issue is to mimic the implementation of CuraEngine. So let's transform its entire algorithm into Python.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Ghostkeeper
842ee7c00e
Reinstate the argument input
Otherwise I can't use it without creating a user 'lfei' or something.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Ghostkeeper
43a8894c64
Convert to Doxygen style comments
As per our code style.

Contributes to issue CURA-5561.
2018-09-05 16:08:48 +02:00
Lipu Fei
f4fe5784a7
Add script to analyze gcode 2018-09-05 16:08:47 +02:00
Ghostkeeper
b02769912f
Don't print slower than 1mm/s
If you set the wall printing speed to 10, it would through inheritance result in an outer wall printing speed of 0. No longer.
2018-09-05 09:42:20 +02:00
Diego Prado Gesto
4098d4d289
Merge pull request #4313 from Ultimaker/CURA-5670_use_tags_to_define_showcase
Build models using reserved tags
2018-09-03 16:11:05 +02:00
Diego Prado Gesto
b638b2274a Count only the material packages by author, not all packages.
Contributes to CURA-5670.
2018-09-03 15:12:52 +02:00
Diego Prado Gesto
bf1d3b964f Skip loading a reply if it's not later handled.
Contributes to CURA-5670.
2018-09-03 14:30:05 +02:00
Lipu Fei
ab572e9de2 SettingFunction evaluation needs a stack to provide values
Note that this is still not correct. When the value gets evaluated, we
need to evaluate it with that container in the stack(s), but this case,
the stack may have other containers, so the evaluation can give
incorrect values because its context is simply not correct. This change
only prevents it from breaking because it's missing a provider.
2018-09-03 14:03:46 +02:00
Aleksei S
f1d2d7ed36 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-03 11:16:42 +02:00
Aleksei S
149a47e5a7 Remove double keys from right click menu, remove backspaceSelectionAction because not used
CURA-5642
2018-09-03 11:15:25 +02:00
Ghostkeeper
6df029971d
Don't crash if layer height is a formula
We obtain the layer height here but that might be a formula so we should evaluate that formula here.

Fixes #4005.
2018-09-03 11:02:24 +02:00
Ghostkeeper
1136033f97
Remove superfluous check for 'ok T:'
This check is never hit because if there is 'ok T:' in the bytes array then it will have hit the first check for 'ok ' and 'T:'.
2018-09-03 10:50:07 +02:00
Mark
9bcc8ffff6
Merge pull request #4288 from thopiekar/patch-2
bq Hephestos2: Getting a rid of custom g-code
2018-09-01 09:25:17 +02:00
Ian Paschal
988b9059b9 Fix code-style
Contributes to CURA-5670
2018-08-31 16:55:03 +02:00
Ian Paschal
dec76a19ed Build models using reserved tags
Contributes to CURA-5670
2018-08-31 16:13:01 +02:00
Lipu Fei
6cceebb117 Revert "Remove double shortcut buttons"
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
2018-08-31 15:14:12 +02:00
Lipu Fei
8a507c34a3
Merge pull request #4312 from Ultimaker/CURA-5676_add_contacts_toolbox
Cura 5676 add contacts toolbox
2018-08-31 13:58:57 +02:00
Lipu Fei
98d8a3f3e3 Fix code style and small cleanup
CURA-5676
2018-08-31 13:49:10 +02:00
Lipu Fei
c4afbe7a67 Convert links to a dict
CURA-5676

Easier to process.
2018-08-31 13:45:04 +02:00
Lipu Fei
9433cf7c45 Change email field to show full email address
CURA-5676
2018-08-31 13:23:41 +02:00
Lipu Fei
e17cf3dfbf Show company website full link as text
CURA-5676
2018-08-31 13:20:42 +02:00
alekseisasin
9bd51d15ae
Merge pull request #4298 from Ultimaker/CURA-5675-reset_machines_for_removed_quality_changes
CURA-5675 Reset machines that use a removed quality changes
2018-08-31 12:00:31 +02:00
alekseisasin
aa2cb7d415
Merge pull request #4212 from fieldOfView/feature_support_infill_angle
Add setting for Support Infill Line Direction
2018-08-31 11:18:03 +02:00
Aleksei S
b0b148f2d0 Remove wrong setting
CURA-5676
2018-08-31 11:06:25 +02:00
Aleksei S
9258c9a7fc Added links to toolbox
CURA-5676
2018-08-31 11:03:30 +02:00
fieldOfView
65f3605d92 Allow the full range of orientations 2018-08-30 14:43:00 +02:00
fieldOfView
ac2125c3a5 Hide setting when support pattern is set to concentric...
because it has no influence on the concentric pattern
2018-08-30 14:36:54 +02:00
alekseisasin
0488494537
Merge pull request #4300 from Ultimaker/remove_double_extensions_cura_5650
change .curaproject.3mf to just use .3mf
2018-08-30 13:19:47 +02:00
Lipu Fei
9f158a995c
Merge pull request #4283 from Ultimaker/CURA-5555_ufp_material_profile
Add materil xml file to UFP file
2018-08-30 09:58:42 +02:00