Set the default minimal layer time to 5 seconds. Properly scale collada files.

[cura.git] / Cura / gui / mainWindow.py

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index bd08dc983a0a2f3d5c4dddb8e2e53c08fd6f5ebe..98a57c5d77c81dd00f4e96256a3fee99a3a3bcdb 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -150,12 +150,6 @@ class mainWindow(configBase.configWindowBase):
                c = configBase.SettingRow(left, "Fill Density (%)", 'fill_density', '20', 'This controls how densily filled the insides of your print will be. For a solid part use 100%, for an empty part use 0%. A value around 20% is usually enough')
                validators.validFloat(c, 0.0, 100.0)
                
-               configBase.TitleRow(left, "Skirt")
-               c = configBase.SettingRow(left, "Line count", 'skirt_line_count', '1', 'The skirt is a line drawn around the object at the first layer. This helps to prime your extruder, and to see if the object fits on your platform.\nSetting this to 0 will disable the skirt. Multiple skirt lines can help priming your extruder better for small objects.')
-               validators.validInt(c, 0, 10)
-               c = configBase.SettingRow(left, "Start distance (mm)", 'skirt_gap', '6.0', 'The distance between the skirt and the first layer.\nThis is the minimal distance, multiple skirt lines will be put outwards from this distance.')
-               validators.validFloat(c, 0.0)
-
                configBase.TitleRow(right, "Speed && Temperature")
                c = configBase.SettingRow(right, "Print speed (mm/s)", 'print_speed', '50', 'Speed at which printing happens. A well adjusted Ultimaker can reach 150mm/s, but for good quality prints you want to print slower. Printing speed depends on a lot of factors. So you will be experimenting with optimal settings for this.')
                validators.validFloat(c, 1.0)
@@ -195,6 +189,12 @@ class mainWindow(configBase.configWindowBase):
                validators.validInt(c, 10)
                configBase.settingNotify(c, self.preview3d.updateCenterY)
 
+               configBase.TitleRow(left, "Skirt")
+               c = configBase.SettingRow(left, "Line count", 'skirt_line_count', '1', 'The skirt is a line drawn around the object at the first layer. This helps to prime your extruder, and to see if the object fits on your platform.\nSetting this to 0 will disable the skirt. Multiple skirt lines can help priming your extruder better for small objects.')
+               validators.validInt(c, 0, 10)
+               c = configBase.SettingRow(left, "Start distance (mm)", 'skirt_gap', '6.0', 'The distance between the skirt and the first layer.\nThis is the minimal distance, multiple skirt lines will be put outwards from this distance.')
+               validators.validFloat(c, 0.0)
+
                configBase.TitleRow(left, "Retraction")
                c = configBase.SettingRow(left, "Minimum travel (mm)", 'retraction_min_travel', '5.0', 'Minimum amount of travel needed for a retraction to happen at all. To make sure you do not get a lot of retractions in a small area')
                validators.validFloat(c, 0.0)