3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
28446 commits 302 branches 270 tags 773 MiB
Commit graph

28446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
afd63c53c0 Escape characters of escape_characters dict at initialisation 
Instead of escaping it each time you read a function with that ugly inline for loop, escape the characters when initialising the dict itself.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
a3936540d8 Move escape characters to be a static class variable 
It is static and constant, so it won't need to initialise this dictionary every time it reads.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
6908f2c011 Move prefix length out of for loop 
It is cached so it only needs to be computed once.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
cfa4382052 Move serialised version number to top of GCode reader/writer 
The version number is more clearly exposed there.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
a12246781d CuraProfileWriter use SaveFile instead of streams 
The SaveFile is safer since it should save the file atomically. This safety has proven important in the past so use it here too.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
3ec790f963 Add CuraProfileWriter plugin 
This plugin writes the default Cura profile format.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
984a8efe1e Allowing profile readers to read multiple file types per plugin 
Both of these plugins only read one file type, but it's allowed now.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
f95bfd8ae3 Add normal Cura profile reader 
This re-introduces the old functionality where you can import .curaprofile files. It's just now in the plug-in format.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
8947873121 Update documentation 
The doxygen documentation of the class and both its functions was also out of date.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
fedfffb98d Update documentation 
Just a slight inaccuracy in the documentation of one of the imports.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
065b954cad GCodeProfileReader plugin properly returns a profile 
Instead of setting the profile as the current profile, return the resulting profile.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
1f35c25b80 Gitignore kate-swp files 
These seem to be swap files created by KDE-based file editors such as KDevelop.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
63d007c02c Rename GCodeReader to GCodeProfileReader 
The new name is more appropriate since it reads only the profiles from the g-code. In the future there might be some other plug-in that reads the actual g-code as for instance a mesh.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
edbbc96281 Update metadata for GCodeReader 
It more accurately describes what the plugin does.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
20151a5042 Change plugin type to profile_reader 
This repairs the profile reading at startup. It should not be a mesh reader.

Contributes to issue CURA-34.
 2015-12-17 13:35:16 +01:00
Ghostkeeper
6d225948f2 Remove newlines in deserialisation 
The artificial line-breaks for the 80-character limit were taken along with the read-by-line of reading the g-code file, apparently. This obviously produced errors in the config parser.

Contributes to issue CURA-34.
 2015-12-17 13:33:10 +01:00
Ghostkeeper
5358dfe2d6 Fix imports for GCodeReader 
This code was more or less copied from the writer. It requires regular expressions and the application, but I didn't take the imports along.

Contributes to issue CURA-34.
 2015-12-17 13:33:10 +01:00
Ghostkeeper
d60d2f6c71 Initial GCodeReader reading profiles from g-code 
Hasn't been tested yet. Probably is wrong.

Contributes to issue CURA-34.
 2015-12-17 13:33:10 +01:00
Ghostkeeper
541873ae6e Revert "Make serialisation version static" 
This reverts commit 1771aafddb5082f51728b69f66862880701b4965.

Contributes to issue CURA-34.
 2015-12-17 13:33:10 +01:00
Ghostkeeper
63bdb08ec2 Make serialisation version static 
It needs to be accessed by GCodeReader to remain consistent.

Contributes to issue CURA-34.
 2015-12-17 13:33:10 +01:00
Ghostkeeper
398dd60637 Limit g-code comments to 80 characters and add prefix 
The prefix is of the form ;SETTING_n where n is the version ID of the profile serialisation.

Contributes to issue CURA-34.
 2015-12-17 13:33:10 +01:00
Ghostkeeper
914ea8ba39 Append settings to g-code 
A serialised version of the settings are now appended to the g-code. It doesn't introduce line breaks yet, so the g-code may be invalid if the firmware doesn't handle lines longer than 80 characters.

Contributes to issue CURA-34.
 2015-12-17 13:33:09 +01:00
Tim Kuipers
788a40c656 lil fix 2015-12-17 12:45:35 +01:00
Jaime van Kessel
303033ec56 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-12-17 10:04:04 +01:00
ckielstra
9bc7b6b6b7 Spelling 2015-12-17 09:21:15 +01:00
Jaime van Kessel
c4df54e671 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-12-16 16:25:52 +01:00
Arjen Hiemstra
dc467b50ce Verify that we have a value before using it 
Contributes to CURA-446
 2015-12-15 14:03:57 +01:00
Ghostkeeper
d23cf97214 Allow multiple file types per mesh reader 
A mesh reader plugin now uses a list of file types that it can offer to read, instead of being limited to one.

Contributes to issue CURA-266.
 2015-12-15 11:21:19 +01:00
Kurt Loeffler
608bfa568b Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. 2015-12-14 11:14:55 -08:00
Kurt Loeffler
384f4fbeaf Reverting 88c8765ee2 2015-12-14 10:29:02 -08:00
Jaime van Kessel
8f6cb26a1f Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-12-14 16:39:23 +01:00
Tim Kuipers
cde6e4c655 JSON: extruder trains were reversed (CURA-494) 2015-12-14 15:20:09 +01:00
Arjen Hiemstra
379ba357cf Merge branch '2.1' 
* 2.1: (60 commits)
  Fix documentation of XRayView class and add a note about RenderPass ctor
  Uranium -> Cura and drop some unused code
  Update XRayView to render properly
  Render Convex Hull below 0 to avoid z fighting artifacts
  Render the grid a bit below 0, so we avoid some z fighting artifacts
  Add a working X-Ray view
  Remove commented out code
  Update with the changed default for backface culling
  Fix convex hull and layer view rendering
  Default Cura to SolidView, not MeshView
  Add SolidView plugin, which is what used to be Uranium's MeshView
  Fix ConvexHullNode so it renders
  Update BuildVolume and ConvexHullNode to use new API
  Remove setLightPosition call
  Revert "Displays settings based on whether they are global-only or not"
  Revert "Adds a global-only role to the SettingOverrideModel"
  Tweak Setting Category header size
  Add warning to PerObjectSettingsPanel when Print Sequence is set to All at Once
  Fix PerObjectSettingsPanel layout
  Remove Print Speed setting from simple mode
  ...
 2015-12-14 14:05:51 +01:00
Arjen Hiemstra
bcaea7db09 Fix documentation of XRayView class and add a note about RenderPass ctor 2015-12-14 13:58:24 +01:00
Arjen Hiemstra
b229769c4e Uranium -> Cura and drop some unused code 2015-12-14 13:58:24 +01:00
Arjen Hiemstra
042c575b18 Update XRayView to render properly 2015-12-14 13:58:24 +01:00
Arjen Hiemstra
45d797515f Render Convex Hull below 0 to avoid z fighting artifacts 2015-12-14 13:58:24 +01:00
Arjen Hiemstra
3e0a06e7ee Render the grid a bit below 0, so we avoid some z fighting artifacts 2015-12-14 13:57:31 +01:00
Arjen Hiemstra
8a5f2b347a Add a working X-Ray view 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
e0d6cd6f90 Remove commented out code 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
7e87f2d1ce Update with the changed default for backface culling 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
435186e6d1 Fix convex hull and layer view rendering 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
63c80c42ce Default Cura to SolidView, not MeshView 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
c5689e6256 Add SolidView plugin, which is what used to be Uranium's MeshView 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
9900a0b327 Fix ConvexHullNode so it renders 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
7395f37efe Update BuildVolume and ConvexHullNode to use new API 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
090f912a55 Remove setLightPosition call 
This should be replaced by a proper light object
 2015-12-14 13:54:42 +01:00
Kurt Loeffler
88c8765ee2 Changed the name of the Lone Width field to Nozzle Diameter in the UI to make its use more clear. When the active machine profile is an Ultimaker 2 it will also mention the Olsson Block. 2015-12-11 12:55:28 -08:00
Tamara Hogenhout
e61d3e4f3e Merge pull request #562 from Ultimaker/feature_ux2-1 
Design rework for 2.1 release
 2015-12-10 11:05:19 +01:00
Tamara Hogenhout
18df633837 Revert "Displays settings based on whether they are global-only or not" 
This reverts commit 2e5bac5392.
 2015-12-10 11:00:40 +01:00