GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-09 19:11:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,119 Commits 295 Branches 268 Tags
Commit Graph

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
9d1b115f2a
Merge pull request #4244 from Ultimaker/feature_favorite_materials 
Feature favorite materials
 2018-08-27 11:12:08 +02:00
Aleksei S
423f1210b0 Catch erros and open the write stream only if the material cointaner is found 
CURA-5555
 2018-08-27 11:10:41 +02:00
Ghostkeeper
45e3355318
Catch failure to parse QML component 
Don't crash the application then.
 2018-08-27 10:57:58 +02:00
Ghostkeeper
336ea150d9
Change tabs into spaces 
As per our code style.
 2018-08-27 10:45:18 +02:00
Lipu Fei
33f495442a Remove unneeded code 
CURA-5162
 2018-08-27 10:44:41 +02:00
Ghostkeeper
eac70dc06d
Change default print job name to 'Untitled' 
This is more common for documents that don't yet have a title in many applications.
 2018-08-27 09:41:19 +02:00
Thomas Karl Pietrowski
82570ee35f
bq Hephestos2: Getting a rid of custom g-code 
* Getting a rid of M800:
This removes M800 completely. The problem is basically that M800 sets the temperature to 200deg.
As a result we tell the firmware to heat up to e.g. 205deg, then M800 kicks in and sets the temperature to 200deg and then we heat up to 205deg again.
Therefore I looked into the firmware and extracted all g-code lines except the one which tells to go to 200deg.

* Getting independent of bq's fork and therefore adding compatibility to Marlin
We use standard g-code, which is safe to be used with both firmware.

Note: This change might be also interesting for other bq products, but can't test on them. Therefore it is up to bq and/or the owners of these products to contribute and correct this here, as I did.
 2018-08-25 14:46:21 +02:00
Jaime van Kessel
1749a6f9d5 Fixed some QML errors 2018-08-24 17:08:32 +02:00
Jaime van Kessel
39b12fed77 Added icons to beter indicate printjob state 
CL-896
 2018-08-24 16:47:46 +02:00
Jaime van Kessel
d57f166b08 Added opacity to preview if print is done / paused 
CL-896
 2018-08-24 16:26:51 +02:00
Jaime van Kessel
9564f98ccc Added context menu to printerTile 
CL-893
 2018-08-24 16:22:06 +02:00
fieldOfView
77f99ecf20 Moved FirmwareUpdater to cura.PrinterOutput 2018-08-24 15:48:11 +02:00
Lipu Fei
8daf02063d Fix quality lookup fallback mechanism 
CURA-5668

The last fallback is the global qualities, either machine-specific or
generic, but not using both. Because if a machine defines its own global
qualities, it is intended to override the existing ones, so do not
fallback again in this case.
 2018-08-24 15:35:03 +02:00
Ghostkeeper
918484819a
Merge branch 'master' into refactor_singleton_settingsbase 2018-08-24 15:24:24 +02:00
Ghostkeeper
aa03fabc57
Remove trailing whitespace 2018-08-24 15:24:00 +02:00
Jaime van Kessel
d7e907f1a5 Icons are now displayed in the printerTile 
CL-896
 2018-08-24 15:13:29 +02:00
Ian Paschal
eea3fc95a4
Merge pull request #4265 from Ultimaker/CURA-5656_new_s5_alu_profiles 
CURA-5656 Add quality profiles for S5
 2018-08-24 15:05:47 +02:00
Jaime van Kessel
aee90081e5 Added machine icons 2018-08-24 14:51:13 +02:00
Jaime van Kessel
86f872ae70 Decreased the spacing between printJob tiles in the queueuueueu 
CL-896
 2018-08-24 14:12:49 +02:00
Jaime van Kessel
5605ff3b46 Fixed fonts 
CL-896
 2018-08-24 14:07:56 +02:00
Jaime van Kessel
36da9cc9e5 Added verticalOffset to popup shadow. 
This way it's more in line with the rest of the elements

CL-896
 2018-08-24 13:52:34 +02:00
Jaime van Kessel
bc651fea92 First printer tile no longer has shadow cut off from top 
CL-894
 2018-08-24 13:50:52 +02:00
Jaime van Kessel
c13f252193 Some spacing / anchoring fixes 
CL-896
 2018-08-24 13:41:33 +02:00
paukstelis
e36f78dd35 Clean up whitespace 2018-08-24 07:27:34 -04:00
Aleksei S
ea935024cf Add materil xml file to UFP file 
CURA-5555
 2018-08-24 13:02:06 +02:00
Ian Paschal
2304aeaceb Expanded states preserved when updating models 
Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section.

It's also the ground work for saving material section expansion to preferences.

Contributes to CURA-5378
 2018-08-24 12:10:32 +02:00
Ian Paschal
13069a2f99 Some file renaming 
Contributes to CURA-5378
 2018-08-24 11:06:44 +02:00
Jaime van Kessel
3e623a6fe6 Added pointer to context popup 
CL-894
 2018-08-24 11:02:05 +02:00
Lipu Fei
61c635fbaf Mock application in unit tests 2018-08-24 10:47:01 +02:00
Ian Paschal
93645e6bfe Reduce component sizes 
Contributes to CURA-5378
 2018-08-24 10:46:23 +02:00
fieldOfView
5d52239201 Code style 2018-08-24 09:09:49 +02:00
Jaime van Kessel
fc83520ad9 Added camera view back to cluster screen 
CL-893
 2018-08-23 20:34:20 +02:00
Jaime van Kessel
6bfa2fed96 Updated display states and fixed some more margins 
CL-896
 2018-08-23 19:46:14 +02:00
Jaime van Kessel
e9d4c36b32 Updated labels 2018-08-23 18:16:39 +02:00
Jaime van Kessel
c703d15cd3 Updated the styling of the context hover 
CL-896
 2018-08-23 18:05:13 +02:00
Jaime van Kessel
dab2efab7f Updated margins & layout for the monitor page 
CL-896
 2018-08-23 17:29:48 +02:00
Ian Paschal
f6b43bd9ab Merge branch 'master' into feature_favorite_materials 
Contributes to CURA-5162, CURA-5378
 2018-08-23 17:24:39 +02:00
Lipu Fei
01cf9ee23b Remove "Experimental" text 2018-08-23 17:08:27 +02:00
Lipu Fei
26fced22bb Add quality profiles for S5 aluminum 
CURA-5656
 2018-08-23 17:08:15 +02:00
Lipu Fei
8582a1ba1a Mock application in unit tests 2018-08-23 17:00:57 +02:00
Ian Paschal
6be9b5e27f Consolidate models some more 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:58:23 +02:00
Ian Paschal
56a5f59964 Cleaner code 
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
 2018-08-23 16:39:40 +02:00
Ian Paschal
8da7773600 Remove unused code 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:04:51 +02:00
Jaime van Kessel
b0d9dc6fdd Added DropShadow to the printer & printjob tiles 
CL-893 && CL-894
 2018-08-23 15:53:32 +02:00
Jaime van Kessel
5176ead0e2 Added print progress to sidebar 
CL-893
 2018-08-23 15:07:31 +02:00
Jaime van Kessel
8c2cd510d8 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-23 12:45:41 +02:00
Ghostkeeper
06525bed4b
Merge branch 'master' into refactor_singleton_settingsbase 
Resolved a conflict in CuraEngineBackend due to refactor removing JSON from the command while master added optional verbose mode in debug mode.

Contributes to issue CURA-4410.
 2018-08-22 17:04:55 +02:00
Ghostkeeper
49e3c23d14
Brackets on new line 
As per our code style.
 2018-08-22 16:53:27 +02:00
alekseisasin
0d293ddced
Merge pull request #4251 from Ultimaker/CURA-5645_no_write_gcode_to_recent_files 
CURA-5645 Do not add saved gcodes to recent files list
 2018-08-22 16:28:58 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view 
Contributes to CURA-5378
 2018-08-22 15:58:58 +02:00