q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed _export suffix. Slighty changed some texts.

master
daid303 2012-10-26 15:43:18 +02:00
parent f70e88521c
commit 83f56338ae
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cura/cura_sf/fabmetheus_utilities/settings.py
View File

@ -395,7 +395,7 @@ def getProfileInformation():
},'export': {
'Activate_Export': "True",
'Add_Descriptive_Extension': DEFSET,
'Add_Export_Suffix': DEFSET,
'Add_Export_Suffix': "False",
'Add_Profile_Extension': DEFSET,
'Add_Timestamp_Extension': DEFSET,
'Also_Send_Output_To': DEFSET,

2
Cura/gui/mainWindow.py
View File

@ -104,7 +104,7 @@ class mainWindow(configBase.configWindowBase):
if profile.getPreference('lastFile') != '':
self.filelist = profile.getPreference('lastFile').split(';')
self.SetTitle(self.filelist[-1] + ' - Cura - ' + version.getVersion())
self.SetTitle('Cura - %s - %s' % (version.getVersion(), self.filelist[-1]))
else:
self.filelist = []
self.progressPanelList = []

2
Cura/gui/simpleMode.py
View File

@ -55,7 +55,7 @@ class simpleModeWindow(configBase.configWindowBase):
if profile.getPreference('lastFile') != '':
self.filelist = profile.getPreference('lastFile').split(';')
self.SetTitle(self.filelist[-1] + ' - Cura - ' + version.getVersion())
self.SetTitle('Cura - %s - %s' % (version.getVersion(), self.filelist[-1]))
else:
self.filelist = []
self.progressPanelList = []

2
Cura/gui/sliceProgessPanel.py
View File

@ -126,7 +126,7 @@ class sliceProgessPanel(wx.Panel):
progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
self.progressGauge.SetValue(int(progresValue))
taskbar.setProgress(self.GetParent(), int(progresValue), self.progressGauge.GetRange())
self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
self.statusText.SetLabel("Preparing: processing %s [%d/%d]" % (stepName, layer, maxLayer))
class WorkerThread(threading.Thread):
def __init__(self, notifyWindow, filelist, cmdList):

4
Cura/util/sliceRun.py
View File

@ -98,7 +98,7 @@ def runSlice(fileNames):
subprocess.call(getSliceCommand(fileName))
def getExportFilename(filename, ext = "gcode"):
return "%s_export.%s" % (filename[: filename.rfind('.')], ext)
return "%s.%s" % (filename[: filename.rfind('.')], ext)
#Get a short filename in 8.3 format for proper saving on SD.
def getShortFilename(filename):
@ -112,7 +112,7 @@ def getSliceCommand(filename):
if slic3rExe == False:
return False
cmd = [slic3rExe,
'--output-filename-format', '[input_filename_base]_export.gcode',
'--output-filename-format', '[input_filename_base].gcode',
'--nozzle-diameter', str(profile.calculateEdgeWidth()),
'--print-center', '%s,%s' % (profile.getProfileSetting('machine_center_x'), profile.getProfileSetting('machine_center_y')),
'--z-offset', '0',