'Solid_Surface_Thickness_layers': calculateSolidLayerCount,
'Start_From_Choice': DEFSET,
'Surrounding_Angle_degrees': DEFSET,
- 'Thread_Sequence_Choice': DEFSET,
+ 'Thread_Sequence_Choice': storedSetting('sequence'),
},'multiply': {
'Activate_Multiply': "True",
'Center_X_mm': storedSetting("machine_center_x"),
'Convex': "True",
'Gap_Width_mm': storedSetting("skirt_gap"),
'Layers_To_index': "1",
+ },'joris': {
+ 'Activate_Joris': storedSetting("joris"),
+ 'Layers_From_index': calculateSolidLayerCount,
},'chamber': {
'Activate_Chamber': "False",
'Bed_Temperature_Celcius': DEFSET,
left, right, main = self.CreateConfigPanel(self)
configWindowBase.TitleRow(left, "Accuracy")
- c = configWindowBase.SettingRow(left, "Extra Wall thickness for bottom/top (mm)", 'extra_base_wall_thickness', '0.0', 'Additional perimeter thickness of the bottom layer.')
+ c = configWindowBase.SettingRow(left, "Extra Wall thickness for bottom/top (mm)", 'extra_base_wall_thickness', '0.0', 'Additional wall thickness of the bottom and top layers.')
validators.validFloat(c, 0.0)
validators.wallThicknessValidator(c)
+ configWindowBase.TitleRow(left, "Sequence")
+ c = configWindowBase.SettingRow(left, "Print order sequence", 'sequence', ['Loops > Perimeter > Infill', 'Loops > Infill > Perimeter', 'Infill > Loops > Perimeter', 'Infill > Perimeter > Loops', 'Perimeter > Infill > Loops', 'Perimeter > Loops > Infill'], 'Sequence of printing. The perimeter is the outer print edge, the loops are the insides of the walls, and the infill is the insides.');
+ c = configWindowBase.SettingRow(left, "Force first layer sequence", 'force_first_layer_sequence', ['True', 'False'], 'This setting forces the order of the first layer to be \'Perimeter > Loops > Infill\'')
configWindowBase.TitleRow(left, "Infill")
c = configWindowBase.SettingRow(left, "Infill pattern", 'infill_type', ['Line', 'Grid Circular', 'Grid Hexagonal', 'Grid Rectangular'], 'Pattern of the none-solid infill. Line is default, but grids can provide a strong print.')
- c = configWindowBase.SettingRow(left, "Solid infill top", 'solid_top', ['True', 'False'], 'Create a solid top surface, if set to false the top is filled with the fill percentage. Useful for cups.')
- c = configWindowBase.SettingRow(left, "Force first layer sequence", 'force_first_layer_sequence', ['True', 'False'], 'This setting forces the order of the first layer to be \'Perimeter > Loops > Infill\'')
+ c = configWindowBase.SettingRow(left, "Solid infill top", 'solid_top', ['True', 'False'], 'Create a solid top surface, if set to false the top is filled with the fill percentage. Useful for cups/vases.')
+
+ configWindowBase.TitleRow(left, "Joris")
+ c = configWindowBase.SettingRow(left, "Joris the outer edge", 'joris', ['False', 'True'], '[Joris] is a code name for smoothing out the Z move of the outer edge. This will create a steady Z increase over the whole print. It is intended to be used with a single walled wall thickness to make cups/vases.')
main.Fit()
self.Fit()
validators.validFloat(c, 0.0)
configWindowBase.TitleRow(right, "Speed")
- c = configWindowBase.SettingRow(right, "Print speed (mm/s)", 'print_speed', '50')
+ c = configWindowBase.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)
validators.warningAbove(c, 150.0, "It is highly unlikely that your machine can achieve a printing speed above 150mm/s")
#self.AddSetting(left, "Height (mm)", settings.IntSpin().getFromValue(10, "machine_height", None, 1000, 200))
configWindowBase.TitleRow(left, "Machine nozzle")
- c = configWindowBase.SettingRow(left, "Nozzle size (mm)", 'nozzle_size', '0.4')
+ c = configWindowBase.SettingRow(left, "Nozzle size (mm)", 'nozzle_size', '0.4', 'The nozzle size is very important, this is used to calculate the line width of the infill, and used to calculate the amount of outside wall lines and thickness for the wall thickness you entered in the print settings.')
validators.validFloat(c, 0.1, 1.0)
configWindowBase.TitleRow(left, "Retraction")
- c = configWindowBase.SettingRow(left, "Minimal travel (mm)", 'retraction_min_travel', '5.0')
+ c = configWindowBase.SettingRow(left, "Minimal travel (mm)", 'retraction_min_travel', '5.0', 'Minimal 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)
- c = configWindowBase.SettingRow(left, "Speed (mm/s)", 'retraction_speed', '13.5')
+ c = configWindowBase.SettingRow(left, "Speed (mm/s)", 'retraction_speed', '13.5', 'Speed at which the filament is retracted')
validators.validFloat(c, 0.1)
- c = configWindowBase.SettingRow(left, "Distance (mm)", 'retraction_amount', '0.0')
+ c = configWindowBase.SettingRow(left, "Distance (mm)", 'retraction_amount', '0.0', 'Amount of retraction, set at 0 for no retraction at all.')
validators.validFloat(c, 0.0)
- c = configWindowBase.SettingRow(left, "Extra length on start (mm)", 'retraction_extra', '0.0')
+ c = configWindowBase.SettingRow(left, "Extra length on start (mm)", 'retraction_extra', '0.0', 'Extra extrusion amount when restarting after a retraction, to better "Prime" your extruder')
validators.validFloat(c, 0.0)
configWindowBase.TitleRow(right, "Speed")
- c = configWindowBase.SettingRow(right, "Travel speed (mm/s)", 'travel_speed', '150')
+ c = configWindowBase.SettingRow(right, "Travel speed (mm/s)", 'travel_speed', '150', 'Speed at which travel moves are done')
validators.validFloat(c, 1.0)
validators.warningAbove(c, 300.0, "It is highly unlikely that your machine can achieve a travel speed above 150mm/s")
- c = configWindowBase.SettingRow(right, "Max Z speed (mm/s)", 'max_z_speed', '1.0')
+ c = configWindowBase.SettingRow(right, "Max Z speed (mm/s)", 'max_z_speed', '1.0', 'Speed at which Z moves are done.')
validators.validFloat(c, 0.5)
- c = configWindowBase.SettingRow(right, "Bottom layer speed", 'bottom_layer_speed', '25')
+ c = configWindowBase.SettingRow(right, "Bottom layer speed (mm/s)", 'bottom_layer_speed', '25', 'Print speed for the bottom layer, you want to print the first layer slower so it sticks better to the printer bed.')
validators.validFloat(c, 0.0)
configWindowBase.TitleRow(right, "Cool")
'speed': 12.759510994,
'raft': 31.4580039978,
'skirt': 19.3436040878,
+ 'joris': 1.0,
'comb': 23.7805759907,
'cool': 27.148763895,
'dimension': 90.4914340973
self.distanceFeedRate.addLine(line)
def parseLine(self, line):
- 'Parse a gcode line and add it to the skin skein.'
+ 'Parse a gcode line and add it to the joris skein.'
splitLine = gcodec.getSplitLineBeforeBracketSemicolon(line)
if len(splitLine) < 1:
return
firstWord = splitLine[0]
+ print 'joris:' + firstWord
if firstWord == 'G1':
self.feedRateMinute = gcodec.getFeedRateMinute(self.feedRateMinute, splitLine)
location = gcodec.getLocationFromSplitLine(self.oldLocation, splitLine)
settings.printProgress(self.layerIndex, 'joris')
elif firstWord == 'M108':
self.oldFlowRate = gcodec.getDoubleAfterFirstLetter(splitLine[1])
- elif firstWord == '(<perimeter>':
+ elif firstWord == '(<edge>':
if self.layerIndex >= self.layersFromBottom:
self.perimeter = []
- elif firstWord == '(</perimeter>)':
+ elif firstWord == '(</edge>)':
self.addJorisedPerimeter()
self.distanceFeedRate.addLine(line)
def addJorisedPerimeter(self):
- 'Add skinned perimeter.'
+ 'Add jorised perimeter.'
if self.perimeter == None:
return
#Calculate the total length of the perimeter.
def getCraftSequence():
'Get the extrusion craft sequence.'
- return 'carve scale bottom preface widen inset fill multiply speed temperature raft skirt chamber tower jitter clip smooth stretch skin comb cool hop wipe oozebane dwindle splodge home lash fillet limit unpause dimension alteration export'.split()
+ return 'carve scale bottom preface widen inset fill multiply speed temperature raft skirt chamber tower jitter clip smooth stretch skin joris comb cool hop wipe oozebane dwindle splodge home lash fillet limit unpause dimension alteration export'.split()
def getNewRepository():
'Get new repository.'
~ianmdlvl / cura.git / commitdiff