GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 03:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,810 Commits 290 Branches 260 Tags
Commit Graph

3453 Commits

Author SHA1 Message Date
Ghostkeeper
b5d1e5be36
Remove 'None' default for quality_type 
It has no semantic meaning to specify that here. The behaviour of this commit should be the same since 'None' is the default value for that parameter.

Contributes to issue CURA-4966.
 2018-02-26 16:21:46 +01:00
Ian Paschal
02c78faabc
Merge pull request #3404 from Ultimaker/CURA-4972_per_object_setting_validation 
Cura 4972 per object setting validation
 2018-02-26 16:06:44 +01:00
Diego Prado Gesto
197508028a Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-26 14:03:14 +01:00
Diego Prado Gesto
f5b3775b7c CURA-4966 When loading a project, check the quality in all the extruder stacks and replace with 
the global quality if they don't match.
 2018-02-26 14:01:43 +01:00
Aleksei S
6df4ad3f6d Merge branch 'master' of github.com:Ultimaker/cura 2018-02-26 11:51:56 +01:00
Aleksei S
cd0846fad2 PostProcessing plugi, script Pause at Height redo layers 
gives incorrect E-values
CURA-4670
 2018-02-26 11:49:51 +01:00
Diego Prado Gesto
1f5d4e90c4 Merge branch 'CURA-4968_support_eraser_on_platform' 2018-02-26 11:28:20 +01:00
Ghostkeeper
6934c3f881
Use self.putValue to write g-code 
Mostly as a test of this function. Seems to work.
 2018-02-26 09:54:42 +01:00
Ghostkeeper
a7e1910711
Add E in the priority list 
This way we're assured of the order in which these parameters occur, even though the firmware doesn't care about it. It's easier to read though.
 2018-02-26 09:54:07 +01:00
Ghostkeeper
5160373580
Add helper function to write g-code lines 
Requested during the post-processing script workshop that I was giving.
 2018-02-26 09:43:10 +01:00
Ghostkeeper
d0cc9ba8a6
Remove debugging prints 2018-02-26 09:42:29 +01:00
Ian Paschal
e3411e9edb CURA-4972 More zen. 2018-02-23 14:52:35 +01:00
Diego Prado Gesto
3c6e94ea81 CURA-4968 Add the support eraser cube to the bottom of the buildplate 
when the automatic drop models preference is OFF
 2018-02-23 13:08:15 +01:00
Aleksei S
ed7dec0cae Fix: per model settings validation 
CURA-4972
 2018-02-23 13:05:29 +01:00
Diego Prado Gesto
94ca4fffe3 CURA-4946 In the gcode just store the default machine definition 2018-02-22 16:46:48 +01:00
Aleksei S
3ed9ac1e83 Fix: Monitor icon state was not updated properly 
CURA-4977
 2018-02-21 14:54:05 +01:00
Diego Prado Gesto
6af5a5d4bc CURA-4946 When storing the gcode profile, the definition must be the 
quality definition if the printer has_machine_quality. Otherwise the
fdmprinter definition must be used as a fallback. If there is no
quality_definition then the printer definition is use.
 2018-02-20 11:11:21 +01:00
Diego Prado Gesto
6a4f519238 Revert "CURA-4946 Add the quality_definition metadata entry to the gcode so when" 
This reverts commit 744313af273ed34a5796d3970c3915f68abaedc7.
 2018-02-20 09:30:05 +01:00
Jaime van Kessel
3cf16fd34b Removed sending of material profiles. 
It takes a godawfull long time and the machine ignores most of them anyway.
 2018-02-19 15:37:08 +01:00
Jack Ha
823ac048fa Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-19 09:14:10 +01:00
Jack Ha
2c689ef03f Log markup 2018-02-19 09:14:04 +01:00
Diego Prado Gesto
cc2cc2a751 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-16 14:02:20 +01:00
Diego Prado Gesto
744313af27 CURA-4946 Add the quality_definition metadata entry to the gcode so when 
parsing, the quality definition is taken into account instead of the
definition.
The message when importing a profile to a different machine,
now shows the expected machine and the current machine definition id.!!
 2018-02-16 14:01:46 +01:00
Aleksei S
f897930950 Fix: Allow connection button for other printers 
CURA-4962
 2018-02-16 11:48:08 +01:00
Aleksei S
86b31c3a6c Fix: in 3.0 version we did not save quality type under extruder.cfg in project 
for custom fdm pritners. For this case during deserializing share quality stack
between global and extruder's stacks
CURA-4966
 2018-02-16 09:12:42 +01:00
Diego Prado Gesto
a2fde9f5f2 Revert "Fix rounded values in qml files" 
This reverts commit f11a1341ee52069f47d9fbca5d2e043b7ff3b17d.
 2018-02-15 14:58:58 +01:00
Diego Prado Gesto
f11a1341ee Fix rounded values in qml files 2018-02-15 13:27:13 +01:00
Diego Prado Gesto
e7b1bb6c7a Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-14 17:24:07 +01:00
Diego Prado Gesto
68acb13853 CURA-4615 Rename to ChangeAtZ also the file, the class name and 
variables.
 2018-02-14 17:23:02 +01:00
Ian Paschal
0b62a312c3 CURA-4869 Infill meshes influence layer count in layer view 
If a layer is empty, don't add it to the total layer count!
 2018-02-14 16:56:07 +01:00
Mark
64ea2399a1 Add tags to urls 2018-02-14 15:15:02 +01:00
Aleksei S
11377d1034 Revert "Added plugin for reading cad files with .step file extension" 
This reverts commit 0cebc2e9f39921daa9c11d4808f4aa4a505ac5fb.
 2018-02-14 14:05:49 +01:00
Aleksei S
0cebc2e9f3 Added plugin for reading cad files with .step file extension 
CURA-4891
 2018-02-14 14:03:57 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Ghostkeeper
3c32a1b0f3
Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-13 15:51:14 +01:00
Ghostkeeper
f91c990fed
Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.) 
This makes it all the same. It is something that came up in our translation pass this time.

Contributes to issue CURA-4883.
 2018-02-13 15:50:59 +01:00
Ian Paschal
c0561bc525 CURA-4935 Can't disable sending anonymous slice data and checking updates 
This is the ~5 minute~ 3 second fix. I know it's not the more proper way to do it, but I've spent several hours on the more proper way to do it and it's causing huge amounts of headache (because, for example, the PluginBrowser installs plugins and the PluginRegistry removes them, and the PluginBrowser can't update the PluginsModel because the PluginsModel is intantiated in QML instead of in `PluginBrowser.py`, etc. etc. etc.

I'm effectively doing a full refactor of this functionality while simultaneously avoiding moving any "install from remote URL" functionality into the PluginRegistry which is dumb.

I'd prefer a simple, stable soution now instead of re-writing this all again.

I'll make a proposal for a proper, organized refactor for Cookies & Cura.
 2018-02-13 15:50:29 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Ghostkeeper
fb0eda72b9
Change tabs into spaces 
As per our code style.
 2018-02-12 11:59:46 +01:00
Ghostkeeper
75265911d4
Add option to pause at layer 
Fixes #3172.
 2018-02-12 11:59:22 +01:00
Ghostkeeper
afeea6e214
Don't interrupt loading scripts when one error occurs 
Instead of breaking the loading of the rest of the scripts, just don't load this particular one.
 2018-02-12 11:23:43 +01:00
Ghostkeeper
b8fce75dac
Track index instead of finding it back later 
It has to iterate over all layers and do string comparison to find the index back. Instead we just keep track of the index so this should improve performance a bit.
 2018-02-12 11:12:55 +01:00
Ghostkeeper
80b99e0323
Use double quotes instead of single quotes 
As per our code style. It doesn't say anything about single-character strings in particular.
 2018-02-12 11:10:57 +01:00
Ghostkeeper
0e23fb15af
Don't skip the first layer 2018-02-12 11:07:15 +01:00
Ghostkeeper
cfdde8dd07
Simplify indentation of pause at height script 
Instead of making lots of nested if statements, use the if statements as an interruption check. This reduces the indentation a lot and makes it easier to read in my opinion. It also makes it easier to add stuff to these checks.
 2018-02-12 11:06:17 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +01:00
Ghostkeeper
183792ae09
Change 'Tweak' into 'Change' and 'tw@' into 'ch@' 
Also in the resulting g-code.

Contributes to issue CURA-4615.
 2018-02-09 10:55:50 +01:00