3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Diego Prado Gesto 2018-02-14 17:24:07 +01:00
commit e7b1bb6c7a
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura.appdata.xml
View file

@ -3,7 +3,7 @@
<component type="desktop"> <component type="desktop">
<id>cura.desktop</id> <id>cura.desktop</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>AGPL-3.0 and CC-BY-SA-4.0</project_license> <project_license>LGPL-3.0 and CC-BY-SA-4.0</project_license>
<name>Cura</name> <name>Cura</name>
<summary>The world's most advanced 3d printer software</summary> <summary>The world's most advanced 3d printer software</summary>
<description> <description>
@ -15,7 +15,7 @@
</p> </p>
<ul> <ul>
<li>Novices can start printing right away</li> <li>Novices can start printing right away</li>
<li>Experts are able to customize 200 settings to achieve the best results</li> <li>Experts are able to customize 300 settings to achieve the best results</li>
<li>Optimized profiles for Ultimaker materials</li> <li>Optimized profiles for Ultimaker materials</li>
<li>Supported by a global network of Ultimaker certified service partners</li> <li>Supported by a global network of Ultimaker certified service partners</li>
<li>Print multiple objects at once with different settings for each object</li> <li>Print multiple objects at once with different settings for each object</li>
@ -26,6 +26,6 @@
<screenshots> <screenshots>
<screenshot type="default" width="1280" height="720">http://software.ultimaker.com/Cura.png</screenshot> <screenshot type="default" width="1280" height="720">http://software.ultimaker.com/Cura.png</screenshot>
</screenshots> </screenshots>
<url type="homepage">https://ultimaker.com/en/products/cura-software</url> <url type="homepage">https://ultimaker.com/en/products/cura-software?utm_source=cura&utm_medium=software&utm_campaign=resources</url>
<translation type="gettext">Cura</translation> <translation type="gettext">Cura</translation>
</component> </component>

2
plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py
View file

@ -20,7 +20,7 @@ i18n_catalog = i18nCatalog("cura")
# The plugin is currently only usable for applications maintained by Ultimaker. But it should be relatively easy # The plugin is currently only usable for applications maintained by Ultimaker. But it should be relatively easy
# to change it to work for other applications. # to change it to work for other applications.
class FirmwareUpdateChecker(Extension): class FirmwareUpdateChecker(Extension):
JEDI_VERSION_URL = "http://software.ultimaker.com/jedi/releases/latest.version" JEDI_VERSION_URL = "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources"
def __init__(self): def __init__(self):
super().__init__() super().__init__()

6
plugins/SimulationView/SimulationView.py
View file

@ -342,6 +342,11 @@ class SimulationView(View):
min_layer_number = sys.maxsize min_layer_number = sys.maxsize
max_layer_number = -sys.maxsize max_layer_number = -sys.maxsize
for layer_id in layer_data.getLayers(): for layer_id in layer_data.getLayers():
# If a layer doesn't contain any polygons, skip it (for infill meshes taller than print objects
if len(layer_data.getLayer(layer_id).polygons) < 1:
continue
# Store the max and min feedrates and thicknesses for display purposes # Store the max and min feedrates and thicknesses for display purposes
for p in layer_data.getLayer(layer_id).polygons: for p in layer_data.getLayer(layer_id).polygons:
self._max_feedrate = max(float(p.lineFeedrates.max()), self._max_feedrate) self._max_feedrate = max(float(p.lineFeedrates.max()), self._max_feedrate)
@ -634,4 +639,3 @@ class _CreateTopLayersJob(Job):
def cancel(self): def cancel(self):
self._cancel = True self._cancel = True
super().cancel() super().cancel()

2
resources/qml/SidebarHeader.qml
View file

@ -421,7 +421,7 @@ Column
// open the material URL with web browser // open the material URL with web browser
var version = UM.Application.version; var version = UM.Application.version;
var machineName = Cura.MachineManager.activeMachine.definition.id; var machineName = Cura.MachineManager.activeMachine.definition.id;
var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName; var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName + "?utm_source=cura&utm_medium=software&utm_campaign=resources";
Qt.openUrlExternally(url); Qt.openUrlExternally(url);
} }
onEntered: { onEntered: {