16106 Commits

Author SHA1 Message Date
Aleksei S
e853cdc04d Removed shortcut from Reset All Model &Transformations
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
944b937036 Simplified unit test, make code clear
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
17d2316da3 Validate shortcut keys in all languages(except default)
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
3a8d023371 Addded test for checking shortcut keys
CURA-5642
2018-09-06 16:06:45 +02:00
Lipu Fei
0b6574e715 Rename script to check_gcode_buffer.py
CURA-5561
2018-09-06 15:36:13 +02:00
Lipu Fei
32a49bf8fa Make annotated output gcode optional 2018-09-06 14:39:52 +02:00
Lipu Fei
053613ad97 Merge remote-tracking branch 'origin/master' into CURA-5561_gcode_analysis 2018-09-06 14:34:30 +02:00
Lipu Fei
bb578be066 Move the script to scripts dir 2018-09-06 14:22:36 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +02:00
Ghostkeeper
ea2b0d0480
Print total predicted number of buffer underruns
I think this is the final metric that we'll want to track.

Contributes to issue CURA-5561.
2018-09-06 09:58:25 +02:00
Lipu Fei
a7f421c60c
Merge pull request #4097 from Ultimaker/fix_layer_number_width
Adjust size of layer number depending on the maximum number of layers
2018-09-06 09:50:32 +02:00
Lipu Fei
2819b6cbc6 Fix code style 2018-09-06 08:57:00 +02:00
Lipu Fei
f9b8a8cbd3 Merge remote-tracking branch 'origin/master' into CURA-5095_collect_user_modified_settings 2018-09-06 08:22:44 +02:00
Lipu Fei
9aea0e5109 Fix quality lookup logic for extruders
CURA-5694

 - Add convenience functions into GlobalStack
 - Use "has_variants" and "has_materials" instead of
 "has_variant_materials"
 - Remove "has_variant_materials"
 - For extruder qualities, skip global qualities if the machine has
   variants or materials
2018-09-06 08:12:55 +02:00
Mark
cfcf52d7c3 Center in parent and increase width. Fits good on Mac 2018-09-05 22:05:08 +02:00
Remco Burema
d3356cdba6
Merge pull request #4142 from smartavionics/mb-improve-overhanging-walls
Improve processing of overhanging walls
2018-09-05 17:38:32 +02:00
Lipu Fei
b21200c6a8 Check for None before updating model
CURA-5670
2018-09-05 17:16:58 +02:00
Ghostkeeper
3e30e26ac0
Move into tests folder
There it can stay and be used on modern code.

Contributes to issue CURA-5561.
2018-09-05 17:16:55 +02:00
Ian Paschal
9e56d6d29f Improved expansion behavior
Contributes to CURA-5682

- Active material is now expanded by default when opening the manager

- Expanded and collapsed sections are saved to preferences

- Sections are now highlighted when collapsed and having a selected material inside

- Bug with losing focus between fields is not yet fixed
2018-09-05 17:16:06 +02:00
Ghostkeeper
f5157aeeaf
Add commands per second to output
Contributes to issue CURA-5561.
2018-09-05 17:15:46 +02:00
Ghostkeeper
bec643cd79
Fix reading F parameter from g-code
We need to divide that by 60 to get into somewhat more sane units than the stupid mm/min that g-code uses.
Also simplifies a few other things there.

Contributes to issue CURA-5561.
2018-09-05 17:09:00 +02:00
Ghostkeeper
23e42164cb
Add total estimated time to output
So that we can verify whether our re-estimation is the same as CuraEngine's original estimation.

Contributes to issue CURA-5561.
2018-09-05 16:08:51 +02:00
Ghostkeeper
de43711226
All times in seconds instead of milliseconds
Everything in our tool chain works in seconds. Let's do that here too. Also, the algorithm from CuraEngine works in seconds as well.

Contributes to issue CURA-5561.
2018-09-05 16:08:51 +02:00
Ghostkeeper
f93a82041d
Fix typo
Contributes to issue CURA-5561.
2018-09-05 16:08:51 +02:00
Ghostkeeper
df435a4cf9
Don't recalculate last trapezoid if last command is not a move
I think we're just missing the last trapezoid then sometimes. Let's see what the effect of that is.

Contributes to issue CURA-5561.
2018-09-05 16:08:51 +02:00
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
Mark
68a62f1a66 Merge branch 'master' into fix_layer_number_width 2018-09-05 14:50:12 +02:00