3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28446 commits 340 branches 299 tags 734 MiB
Commit graph

6967 commits

Author SHA1 Message Date
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
Ghostkeeper
99780c3b44
Fix casing of getMetadataEntry 
This is done a bit inconsistently because it's unclear whether metadata should be considered as one word or two. I'd say it is one word, not 'meta data', but people seem to disagree.

Contributes to issue CURA-4243.
 2017-11-27 13:31:29 +01:00
Jaime van Kessel
0613b1e4b7 Creating components is now done with the prefab function 
CURA-4568
 2017-11-27 13:00:49 +01:00
Lipu Fei
1866c4ee66 Split user settings for single extrusion machines 
CURA-4617
 2017-11-27 12:56:53 +01:00
Ghostkeeper
4189f8dfa3
Use new findDirtyContainers function 
This prevents all instance containers from being loaded every time we auto-save.

Contributes to issue CURA-4243.
 2017-11-27 11:59:37 +01:00
Jaime van Kessel
f570ba046b Added rudimentary jogging controls for UM3 
This needs a bit more love; The machine is a bit stupid when it comes to
moving outside of build area.

CL-541
 2017-11-27 11:02:56 +01:00
Jaime van Kessel
00eeb835ac ManualPrinterControl uses correct functions again 
CL-541
 2017-11-27 10:22:30 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Ghostkeeper
9938678347
Fix setting IDs of empty containers 
The _id hasn't been used for a very long time.

Contributes to issue CURA-4243.
 2017-11-27 09:16:27 +01:00
Ruben D
ffef26097d
Merge branch '3.1' 2017-11-26 18:48:42 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder 
CURA-4620
 2017-11-25 02:25:36 +01:00
fieldOfView
77d134a3b7 Fix python error when CrashHandler is opened before opengl is initialised 
Contributes to #2837
 2017-11-24 16:55:18 +01:00
Ghostkeeper
ebe766a7c8
Set definition by their ID 
The new function for setting the definition just adds the ID to the metadata.

Contributes to issue CURA-4243.
 2017-11-24 16:45:09 +01:00
Ghostkeeper
4a8dacbe06
Make crash handler easier to translate 
All that formatting doesn't need to be translated along. It's only confusing, especially because of those variable names. They always need to be in that position anyway.

Contributes to issue CURA-4601.
 2017-11-24 13:16:14 +01:00
Aleksei S
6cea9c59e8 Prevent crash handler exception 2017-11-24 11:59:09 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3 
CL-541
 2017-11-24 11:26:30 +01:00
Lipu Fei
c7667b56e2 Multiple fixes for stacks 
CURA-4617
 2017-11-24 09:45:59 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing 
CL-541
 2017-11-24 09:22:50 +01:00
Jaime van Kessel
1c2c4d4163 Added property to indicate if output device accepts commands 
Instead of how this was previously done, it's now tied to the auth state.

CL-541
 2017-11-23 17:07:24 +01:00
Ghostkeeper
37935a8a90
Load only metadata on start-up 
Contributes to issue CURA-4243.
 2017-11-23 16:47:55 +01:00
Jaime van Kessel
0b91112d72 Fixed postForm 
Setting the type of the request to json messed up the multi-part stuff.

CL-541
 2017-11-23 16:43:52 +01:00
Lipu Fei
2397b68cd7 Optimize MaterialsModel update 
CURA-4546
 2017-11-23 14:07:40 +01:00
Jaime van Kessel
8b8d67b3a8 LegacyUM3 now handles warnings & errors again 
CL-541
 2017-11-23 13:37:59 +01:00
Lipu Fei
17f09ec21e Fix variant/material/quality handling in stacks 
CURA-4613
 2017-11-23 12:46:33 +01:00
Lipu Fei
18c7a5acf3 Pass optional file_name for deserialization 
CURA-4613

Some upgrades depend on the file_name, so the file_name is needed in
this case.
 2017-11-23 11:28:16 +01:00
Jaime van Kessel
96d5c7152b Added sending material profiles to LegacyUM3 
CL-541
 2017-11-23 10:31:39 +01:00
Thomas Karl Pietrowski
269b52487e
CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished 
If this commit gets merged into Uranium, then _reloadMeshFinished is not needed anymore.
31bff5b9b9
The function has been moved, so reloading a mesh after a file has been modified is possible.
 2017-11-22 17:15:47 +01:00
Ghostkeeper
105d7a5615
Return newly added single extruder 
The workspace reader needs to use it to get the correct material.

Contributes to issue CURA-4604.
 2017-11-22 17:12:53 +01:00
ChrisTerBeke
6c3eaca0fd fix loading user changes container for single extruder machine 2017-11-22 16:22:23 +01:00
Jack Ha
3b5ed70113 CURA-4602 Fixed active custom profile selected check 2017-11-22 16:15:06 +01:00
Lipu Fei
a7a3ba9500 Always update the job name when a project file is loaded 
CURA-4553
 2017-11-22 13:10:09 +01:00
Jaime van Kessel
7465a6551a Setup the authentication stuff for LegacyUM3 
CL-541
 2017-11-22 11:59:07 +01:00
ChrisTerBeke
532cfd8404 Fix showing correct quality changes in dropdown list after upgrading - CURA-4482 2017-11-22 10:48:21 +01:00
Lipu Fei
f8fe6cd455 Treat project files the same way as model files for job name 
CURA-4553
 2017-11-22 10:17:53 +01:00
Lipu Fei
aeb478bb4b Should only show Keep/Discard dialog when it's needed 
CURA-4599
 2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7 Show Keep/Discard dialog after the containers have been changed 
CURA-4599

Or the default values will reflect those before the switch.
 2017-11-22 09:18:20 +01:00
Jaime van Kessel
f987e6d977 Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller. 
It's actually up to the controller to say something about this, so this location makes more sense

CL-541
 2017-11-21 16:59:17 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file 
CL-541
 2017-11-21 16:52:37 +01:00
ChrisTerBeke
0625d22e04 Fix update script for single extrusion quality changes - CURA-4482 2017-11-21 16:43:05 +01:00
Jaime van Kessel
34e808d585 PrinterOutputModel now has different extruders if it has more than one. 
It used to just fill the list with references to the first one created.
CL-541
 2017-11-21 16:36:51 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files. 
This makes it a whole lot easier to get an overview.

CL-541
 2017-11-21 16:06:30 +01:00
ChrisTerBeke
7c28f6f149 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-21 15:32:08 +01:00
ChrisTerBeke
62d70b46d6 Fix filtering custom profiles per extruder - CURA-4482 2017-11-21 15:31:59 +01:00
Lipu Fei
8782e2e529 Rename parameters 
CURA-4581
 2017-11-21 15:12:56 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again 
CL-541
 2017-11-21 15:12:23 +01:00
Jaime van Kessel
9cfe9769d3 Printers now automatically try to connect again 
CL-541
 2017-11-21 14:47:55 +01:00
Jaime van Kessel
a8e71cf50c NetworkManager is now created on demand and re-created after a certain timeout. 
CL-541
 2017-11-21 14:35:17 +01:00
Lipu Fei
f18cb951fc Use workspaceLoaded signal instead of projectFileLoaded 
CURA-4581
 2017-11-21 13:49:25 +01:00
Jaime van Kessel
b1649f2d38 Added PrintJob handling to ClusterUM3 
CL-541
 2017-11-21 11:01:19 +01:00