3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
6996 commits 305 branches 272 tags 787 MiB
Commit graph

6996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Ha
9bf4dbd24f Fix wrong variable name 2016-08-10 09:44:27 +02:00
Jack Ha
decf998d68 Code style, semicolons 2016-08-10 09:17:10 +02:00
Seva Alekseyev
5ff3130260 Fix for the Extrusion node, the trickiest geometry of them all 2016-08-09 14:10:06 -04:00
fieldOfView
8fbc85dd55 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:44:14 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:43:09 +02:00
Ghostkeeper
a0df0c76de
Use correct material profile in extruder stack 
The material profile is more specific inside a material profile if the machine has material quality profiles.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
4d13622a6e
Split profiles also per variant 
But of course the variant names are strange in the new material profiles.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
9c7a28fa2d
Don't break if current settings machine is unknown 
Currently it sets the user profile to 'empty', which is bad because empty is read-only. But it allows me to continue for now. I'll find a solution for that later.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
36b027b290
Fix copying ConfigParser 
Turns out that copy.copy() doesn't work on ConfigParsers. It returns a different instance but modifying that instance still modifies the old configs. Deep copy isn't allowed. But this dictionary copy works.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
71505a8b35
Use normal config only if not material(-specific) profile 
Other profiles should just return an array with only their single profile.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
9a555fcab0
Fix call to VersionUpgrade21to22.machinesWithMachineQuality 
It needs that stupidly long path if we're using imports inside a plug-in.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
1428f67798
Rename machines_with_machine_quality to machinesWithMachineQuality 
As per the code style conventions. Sorry, I'm used to other conventions in one of my own projects.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
36f84017cf
Move _machines_with_machine_quality to VersionUpgrade21to22 
It's going to need to be used by the upgrader of machine instances as well, that's why.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
7481f0802e
Split profiles into multiple if new printer has material profiles 
If the old profile didn't specify any material, it would be global. But if the new machine specifies that its profiles are material-specific, these profiles have to be split into multiple profiles in order to be able to show them in Cura 2.2.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
af86375ba3
Output arrays of files rather than a single file 
This is needed because the version upgrade system now allows for a version upgrader to output any number of files.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Seva Alekseyev
315b4a46b7 Bug fix 2016-08-09 11:46:41 -04:00
Jaime van Kessel
967591bccb Infill pattern is now viewed from right stack again 
CURA-2072
 2016-08-09 17:20:37 +02:00
Jaime van Kessel
433db40e9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-09 17:11:23 +02:00
Jaime van Kessel
c381b82ac1 Extruder nr is now sent as string 
CURA-2071
 2016-08-09 17:09:48 +02:00
Jack Ha
223b8f28bb Update print monitor button labels and enabled. CURA-2060 2016-08-09 16:20:40 +02:00
fieldOfView
7011520845 Select the UM3 that we are connected to if it is in the list 
CURA-2035
 2016-08-09 15:54:20 +02:00
fieldOfView
7e8eb2044a Sort list of discovered printers 
CURA-2035
 2016-08-09 15:19:58 +02:00
fieldOfView
7f83c22f74 Add "refresh" button to list of network printers 
CURA-2035
 2016-08-09 15:18:57 +02:00
Jack Ha
2d723cbb57 Comments CURA-2064 2016-08-09 14:54:09 +02:00
fieldOfView
bd6e36f487 Add documentation 
CURA-2035
 2016-08-09 13:54:13 +02:00
fieldOfView
0816663e16 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-08-09 13:50:06 +02:00
fieldOfView
a649bdcb32 Speed up Bonjour discovery and make it slightly more robust 
CURA-2035
 2016-08-09 13:49:47 +02:00
Jaime van Kessel
86a65e495b Close now resets authentication & timeout data. 
CURA-1936
 2016-08-09 13:10:13 +02:00
fieldOfView
5f51804ba6 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-08-09 11:22:45 +02:00
fieldOfView
a0535a7aaf Add some logging to debug discovery issues 
CURA-2035
 2016-08-09 11:22:26 +02:00
Jack Ha
3a0b9ccafe Typo CURA-1986 2016-08-09 11:22:24 +02:00
Jack Ha
a288ab321f Display an error message when "Print over network" if printer not idle. 
CURA-1986
 2016-08-09 11:19:39 +02:00
Jack Ha
fc462cdf6f Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-09 10:57:42 +02:00
Jack Ha
f60ba6ddf0 Enable Abort Print button while in pre_print. 2016-08-09 10:57:28 +02:00
fieldOfView
70a93ac0a2 Only associate to a Jedi if the MachineAction is currently shown 
CURA-2041
 2016-08-09 10:27:19 +02:00
fieldOfView
c7a120edd5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-09 09:56:40 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Jaime van Kessel
87a0543d0c Added bit more logging to USBConnection 
This should make the debugging easier out in the field.
 2016-08-09 09:37:31 +02:00
Seva Alekseyev
d32c300ee7 Support for explicit length unit override in X3D header 2016-08-08 14:11:30 -04:00
fieldOfView
7471b00eff Set the material container to a sane default 2016-08-08 18:16:22 +02:00
fieldOfView
5fd476a2f7 Update the has_materials metadata entry when changing gcode flavor 2016-08-08 18:06:39 +02:00
Tim Kuipers
68798a0c81 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-08 17:13:44 +02:00
Jack Ha
6d52319ee4 Adjusted visibility of printer monitor progress bar + percentage. 
CURA-2064
 2016-08-08 17:08:01 +02:00
Tim Kuipers
6477e588da JSON feat: override max z feedrate (CURA-1049) 2016-08-08 17:02:49 +02:00
Seva Alekseyev
bfd7883c87 Initial support for the X3D scene file format (see http://www.web3d.org/). 
For now, just mesh import. Supports all geometry nodes in Rendering, Geometry3D, CAD geometry modules. No support for materials, color, or textures. Normals in the file (if any) are ignored. Light sources, viewpoints, sensors, world, shaders, scripts also ignored.
 2016-08-08 10:50:38 -04:00
Jack Ha
b365cdfd0f Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-08 16:26:20 +02:00
Jack Ha
1bd0d65e0a Added user feedback after pressing Pause / Resume in network printer. 
The button displays Pausing... or Resuming... until a new status update.

CURA-2060
 2016-08-08 16:25:01 +02:00
fieldOfView
20d2cd56a0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-08 15:41:33 +02:00
fieldOfView
2c61fe3249 Tweak layout of Per Object Settings 
CURA-1799
 2016-08-08 15:41:20 +02:00
fieldOfView
ca2daae6ab Add a "show all" toggle to the select per object setting window 
This way the user can add a setting that is not made visible in the sidebar. Adding a specific setting no longer needs a detour through the setting visibility preference page.

CURA-1799
 2016-08-08 15:11:38 +02:00