Arjen Hiemstra
edf2802099
Use a StackView and non-dynamic instantation for the sidebar modes
...
Improves performance at the cost of flexibility.
But we did not use that flexibility anyway.
2016-01-29 14:58:08 +01:00
Ghostkeeper
6271b4039b
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-01-29 11:23:01 +01:00
Ghostkeeper
c53969f1bd
Wait for FinishedSlicing message to mark slicing as finished
...
Instead of waiting until progress is more than 99%, wait for the dedicated FinishedSlicing message.
Contributes to issue CURA-427.
2016-01-29 11:22:04 +01:00
Ghostkeeper
8915da812b
Merge pull request #613 from thopiekar/2.1-additional-mime-types
...
Adding support for additional object files
2016-01-29 10:26:43 +01:00
Arjen Hiemstra
e74d300fb3
Make things work properly using the new Arcus API
2016-01-28 18:07:42 +01:00
Tim Kuipers
319d8197ab
fix: bq_hephestos profile syntax error
2016-01-28 15:29:20 +01:00
Tim Kuipers
8a48791a0b
Merge branch '2.1'
2016-01-28 15:25:18 +01:00
Arjen Hiemstra
21f70c4123
Add Cura protobuf protocol file
...
Should find some way of sharing the one in CuraEngine but this works for
now
2016-01-28 03:23:47 +01:00
Arjen Hiemstra
22fb26bae6
Update StartSliceJob to reflect the new Arcus API
2016-01-28 03:23:10 +01:00
Arjen Hiemstra
6930008dd8
Pass the protocol file to Backend's createSocket
2016-01-28 03:22:18 +01:00
Ghostkeeper
c3eb810aa2
Update DE, EN, FI and FR translations
...
These were given by our translators. They are checked for form errors by me.
Contributes to issue CURA-526.
2016-01-27 13:28:36 +01:00
Tim Kuipers
d6bd59da0e
made some settings max value warning instead of impossible
2016-01-27 10:21:34 +01:00
Tim Kuipers
4edc4ece86
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-01-26 15:55:13 +01:00
Tim Kuipers
7c652ed069
JSON: refactor: moved draft shield options to Cooling category
2016-01-26 15:55:00 +01:00
Ghostkeeper
71e390321c
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-01-26 13:58:16 +01:00
Ghostkeeper
f09b927288
Add check if resulting profile is empty
...
If it is, a warning is logged.
Contributes to issue CURA-37.
2016-01-26 13:58:00 +01:00
Ghostkeeper
e7b2586d36
Don't add to profile if setting is legacy default
...
If a setting is equal to the legacy setting's default value, then it doesn't get added to the profile either.
Contributes to issue CURA-37.
2016-01-26 13:50:46 +01:00
Ghostkeeper
c0b5832a59
Remove debug prints
...
Shouldn't have committed those. Sorry!
Contributes to issue CURA-37.
2016-01-26 13:32:52 +01:00
Ghostkeeper
5374d253e9
Evaluate to old defaults if setting is missing
...
If the setting is missing from the legacy profile, let it evaluate to the default in the legacy Cura.
Contributes to issue CURA-37.
2016-01-26 13:27:42 +01:00
Thomas-Karl Pietrowski
350466c73e
Adding instructions to CMakeLists.txt to install cura.sharedmimeinfo as cura.xml into ${CMAKE_INSTALL_DATADIR}/mime/packages/
2016-01-25 19:34:33 +01:00
Thomas-Karl Pietrowski
a88191d4c5
Adding cura.sharedmimeinfo
...
* Originally taken from my own packaging of Cura on launchpad: ppa:thopiekar/cura - https://launchpad.net/~thopiekar/+archive/ubuntu/cura
* It adds mime-types, which are supported by Cura, to the mime-database, so filemanagers can recognize these files.
* This sharemimeinfo includes currently 3MF, STL and OBJ.
2016-01-25 18:47:00 +01:00
Ghostkeeper
c06ed1e56d
Merge pull request #610 from thopiekar/2.1-i18n-de-desktop-file
...
i18n: de: adding german translation to cura.desktop
2016-01-25 10:15:49 +01:00
Thomas-Karl Pietrowski
c6c7ca5d2f
Adding support for additional object files:
...
* 3MF files
* OBJ files
2016-01-23 20:34:25 +01:00
Thomas-Karl Pietrowski
aee89f2f16
Alternative fix for NVidia graphic cards
...
As I upgraded my computer to a developer version of Ubuntu, I noticed that the OpenGL module, which is needed for our workaround, is currently broken.
So I browsed the web and found the reason why it is needed at all and found a alternative.
The reason for the problem is that Qt5 is dynamicly loading libGL.so instead of libGL.so.1, as the OpenGL module loads libGL.so.1.
So if you install the closed-source nvidia drivers it only creates a link from libGL.so.1 to it's binaries and the result is that PyQt5/Qt5 tries to load Mesa binaries together with NVidia binaries.
By importing the OpenGL module you preload the libGL.so.1, but this can also be done directly by using ctypes.
* Replaced the OpenGL fix with the ctypes fix
* Added a TODO
2016-01-23 19:39:54 +01:00
fieldOfView
e723b78f09
Remove vestigial import
2016-01-23 17:15:42 +01:00
fieldOfView
3a64bc58b7
Reimplement fix without connecting/disconnecting events repeatedly
2016-01-23 17:10:16 +01:00
fieldOfView
7b09bb0c9e
Deley center_on_selection cameraAnimation until mouse release
2016-01-23 16:59:29 +01:00
Thomas-Karl Pietrowski
cb210f3546
i18n: de: adding german translation to cura.desktop
2016-01-23 11:17:28 +01:00
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