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 2
28446 commits 302 branches 270 tags 773 MiB
Commit graph

28446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas-Karl Pietrowski
a676b5df1b Merge remote-tracking branch 'upstream/master' 2016-01-23 11:14:36 +01:00
fieldOfView
40bfd32f06 Update UM2+ backplate 2016-01-22 22:10:54 +01:00
Jaime van Kessel
5e5bcfb5fd Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 16:54:23 +01:00
Jaime van Kessel
23984289c4 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 16:54:01 +01:00
Ghostkeeper
26bf29630e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 16:42:28 +01:00
Ghostkeeper
67c82204ba Fix codestyle issues 
They were introduced by b28bfc9602

Contributes to issue CURA-266.
 2016-01-22 16:41:07 +01:00
Jaime van Kessel
0b920950d4 Layer processing is now only done when no slicing is occuring. 
Contributes to CURA-693
 2016-01-22 16:38:03 +01:00
Jaime van Kessel
3a32cb5f60 Merge pull request #606 from Ultimaker/fix_cura-623 
Fix cura 623
 2016-01-22 15:35:37 +01:00
Ghostkeeper
6ef5aeb02b Remove superfluous comment 
This should be obvious. The thought process was that now we're using the builder instead of making the MeshData object directly, but that has only relevance if you still remember what the old code was.

Contributes to issue CURA-625.
 2016-01-22 15:25:08 +01:00
Jaime van Kessel
ffa87a9302 Fixed issue that caused crash when renaming printer 
CURA-670
 2016-01-22 12:25:22 +01:00
Jaime van Kessel
6ce25a0369 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 11:38:07 +01:00
Jaime van Kessel
414be1f851 Added ultimaker2 plus definitions 2016-01-22 11:37:18 +01:00
Tim Kuipers
829665ace9 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 10:58:36 +01:00
Tim Kuipers
261e8d9b08 updated protobuff generated files to include SlicingFinished msg (CURA-427) 2016-01-22 10:58:24 +01:00
Ghostkeeper
0a07449759 Realign BQ Hephestos 2 platform 
Contributes to issue #595.
 2016-01-22 10:57:15 +01:00
fieldOfView
3768975aae Disable actions while tooloperation is ongoing 2016-01-21 15:45:52 +01:00
fieldOfView
c1c2c0030e Prevent deleting objects while a tooloperation is ongoing 2016-01-21 15:43:01 +01:00
fieldOfView
42673c7c68 Disable using the toolbar while a tooloperation is ongoing 2016-01-21 15:42:20 +01:00
fieldOfView
f8e2d4f035 Disable toolbar while running tooloperation 2016-01-21 15:42:20 +01:00
Ghostkeeper
fbd5471f5b Set machine_nozzle_size when importing legacy profile 
Machine_nozzle_size was just a machine setting when this dictionary of doom was made.

Contributes to issue CURA-37.
 2016-01-21 15:01:50 +01:00
Ghostkeeper
0d16fdf3ba Use a uniform-color shader for selection 
In layer view, the selection shader is now a uniform-color shader. This shader does not use the vertex colours but makes the entire silhouette the same colour.

Contributes to issue CURA-625.
 2016-01-21 14:24:57 +01:00
Ghostkeeper
7e1927434a Use MeshBuilder to make convex hull mesh 
The convex hull mesh was made without adding colours to the vertices. This was probably causing the convex hull to appear red on some machines, if red is the default vertex colour. Using meshbuilder makes code maintenance easier and allows us to easily set the colour of the vertices. Hopefully this fixes the issue with the red convex hulls.

Contributes to issue CURA-625.
 2016-01-21 13:55:11 +01:00
Ghostkeeper
89a4ab0fe2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-21 10:25:14 +01:00
Ghostkeeper
29a848d90c Turn BQ Hephestos 2 platform around 180 degrees 
Model is rotated around the z-axis in CloudCompare.
 2016-01-21 10:25:00 +01:00
Ghostkeeper
e73f69e457 Merge pull request #603 from thopiekar/adding-mime-types-images 
Adding new supported image formats
 2016-01-21 10:09:51 +01:00
Jaime van Kessel
ccfa4a4842 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-20 17:07:38 +01:00
Jaime van Kessel
0eb327b97b Increased size of modal window 
CURA-692
 2016-01-20 17:06:56 +01:00
Ghostkeeper
be284e1d05 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-20 14:42:55 +01:00
Ghostkeeper
e23a9ea997 Move the changing of the setting after import out of try-except 
It should never give an exception, so if it does, crash and burn the application.

Contributes to issue CURA-37.
 2016-01-20 14:42:32 +01:00
Jaime van Kessel
4d14e375ca Merge pull request #588 from Ultimaker/fix_cura-679 
Don't include origin in boundingbox
 2016-01-20 12:19:18 +01:00
Thomas-Karl Pietrowski
bb12d928cc Adding new supported image formats 
Don't know how long we support opening images, but this commit adds them to the *.desktop file for Linux based desktops.
So "open with"-actions will now show Cura for these media-types.
 2016-01-19 18:28:08 +01:00
Ghostkeeper
edc2b2c7e2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-18 17:36:59 +01:00
Ghostkeeper
bc0207cd14 Add invisible preference for file type of output 
This preference can't be made visible since a string freeze is into effect, but at least a user could go into the .cfg file and set the setting manually.

Contributes to issue CURA-611.
 2016-01-18 17:36:41 +01:00
Ghostkeeper
70b8c64090 Let Cura set default output file type to g-code 
The default preference for last remembered output file type is set to G-code. So at the first run, it'll have g-code selected by default. In subsequent runs it will remember what the setting was, so the user can set it to something else and it will remember that.

Contributes to issue CURA-611.
 2016-01-18 17:04:21 +01:00
Tamara Hogenhout
310491531f New translation files 
For now without the actual translations

Contributes to #CURA-526
 2016-01-18 12:24:46 +01:00
Tamara Hogenhout
c48051e39d marked the string as translatable 
Contributes to #CURA-526
 2016-01-18 12:19:59 +01:00
fieldOfView
a3e8b313cd Add LoadProfileDialog 
Non-accessible and non-functional for now to defeat the string-freeze for
2.1
 2016-01-17 21:50:11 +01:00
Ghostkeeper
136eb65105 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-17 14:42:27 +01:00
Ghostkeeper
0e8cc11676 Update protobuf file 
Cura's protobuf-generated file was out of sync with CuraEngine, resulting in socket errors.

Contributes to issue CURA-605.
 2016-01-17 14:35:06 +01:00
Kurt Loeffler
44217fbf94 Changed the translation string context in the ComboBox items in the image import dialog to their correct value of "@item:inlistbox". 2016-01-15 09:55:10 -08:00
Tamara Hogenhout
a43f9ef435 makes the mm's square again 
fixes #CURA-526
 2016-01-15 17:20:40 +01:00
Ghostkeeper
d6b6c919fc Fix typo in preference description 
nog -> not
 2016-01-15 17:13:36 +01:00
Tamara Hogenhout
26d27e4664 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-15 16:18:46 +01:00
Tamara Hogenhout
caae63a1d9 The fileBaseName can be used from both the hasMesh signal as when the file is opened using the terminal 
It also fixes the undo problem

Contributes to #CURA-707
Contributes to #CURA-620
Contributes to #CURA-687
#591
 2016-01-15 16:17:12 +01:00
Tamara Hogenhout
8af00b4195 Just a little cleanup 
so it is more clear when JobSpecs uses the fileBaseName from cura_app.py and when it uses fhe fileBaseName from cura.qml

Contributes to #CURA-707
Contributes to #CURA-620
#591
 2016-01-15 16:11:08 +01:00
Tamara Hogenhout
a1be5a080f Allows for a file to be opened using the terminal 
or something alike for instance when the file is dragged onto the logo(MacOS) or with 'open with'(Windows)

Fixes to #CURA-707
Fixes to #CURA-620
Fixes #591
 2016-01-15 16:06:01 +01:00
Jaime van Kessel
f5f855dfc2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-15 15:19:38 +01:00
Jaime van Kessel
44ab89724e ConvexHullDecorator is now correctly duplicated 
The deepcopy of convex hull decorator now returns an empty (new) ConvexHulldecorator object
This ensures that the init is correctly called. CURA-665
 2016-01-15 15:18:16 +01:00
Ghostkeeper
1e65566a22 Merge pull request #592 from thopiekar/2.1-i18n-scan-languages 
Scanning i18n directory for languages
 2016-01-15 12:20:28 +01:00
Thomas-Karl Pietrowski
e1966a7ea5 Scanning i18n directory for languages: 
Instead of having a list of languages hardcoded, we scan the i18n directory for available languages.
It was a TODO, which was left after fixing po-file installation. After finding the macro I decided to fix it here.
The reference to the added macro is there as an URL.
 2016-01-14 18:31:23 +01:00