From: daid303 Date: Fri, 8 Mar 2013 09:31:55 +0000 (+0100) Subject: Merge fix. X-Git-Tag: 13.05~194 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=58e89a896f83601e48b53d634099e2a428b2fe37;p=cura.git Merge fix. --- 58e89a896f83601e48b53d634099e2a428b2fe37 diff --cc Cura/gui/mainWindow.py index 8b7f26ff,c9507832..d83fd99e --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@@ -623,10 -626,10 +626,10 @@@ class normalSettingsPanel(configBase.co c = configBase.SettingRow(right, "Initial layer thickness (mm)", 'bottom_thickness', '0.0', 'Layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier. Set to 0.0 to have the bottom layer thickness the same as the other layers.') validators.validFloat(c, 0.0) validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 3.0 / 4.0), "A bottom layer of more then %.2fmm (3/4 nozzle size) usually give bad results and is not recommended.") - # c = configBase.SettingRow(right, "Cut off object bottom (mm)", 'object_sink', 0.05, '...') - c = configBase.SettingRow(right, "Cut off object bottom (mm)", 'object_sink', 0.05, 'Sinks the object into the platform, this can be used for objects that do not have a flat bottom and thus create a too small first layer.') - validators.validFloat(c, 0.0) - configBase.settingNotify(c, lambda : self.GetParent().GetParent().GetParent().preview3d.Refresh()) - c = configBase.SettingRow(right, "Duplicate outlines", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.') ++# c = configBase.SettingRow(right, "Cut off object bottom (mm)", 'object_sink', 0.05, 'Sinks the object into the platform, this can be used for objects that do not have a flat bottom and thus create a too small first layer.') +# validators.validFloat(c, 0.0) +# configBase.settingNotify(c, lambda : self.GetParent().GetParent().GetParent().preview3d.Refresh()) +# c = configBase.SettingRow(right, "Duplicate outlines", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.') self.SizeLabelWidths(left, right)