pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename in source files to Cura

Browse source
This commit is contained in:
Daid 2012-03-24 10:51:52 +01:00
parent 25687ea3b8
commit 895fe2a180
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SkeinPyPy/fabmetheus_utilities/settings.py
View file

@ -88,7 +88,7 @@ def calculateMultiplyDistance(setting):
edgeWidth = calculateEdgeWidth(setting)
return 10.0 / edgeWidth
def getSkeinPyPyProfileInformation():
def getProfileInformation():
return {
'carve': {
'Add_Layer_Template_to_SVG': DEFSET,
@ -400,9 +400,9 @@ def safeConfigName(name):
def getReadRepository(repository):
"Read the configuration for this 'repository'"
info = getSkeinPyPyProfileInformation()
info = getProfileInformation()
if not info.has_key(repository.name):
print "Warning: Plugin: " + repository.name + " missing from SkeinPyPy info"
print "Warning: Plugin: " + repository.name + " missing from Cura info"
return repository
info = info[repository.name]
@ -410,7 +410,7 @@ def getReadRepository(repository):
for p in repository.preferences:
name = safeConfigName(p.name)
if not info.has_key(name):
print "Setting: " + repository.name + ":" + name + " missing from SkeinPyPy info"
print "Setting: " + repository.name + ":" + name + " missing from Cura info"
continue
if isinstance(info[name], types.FunctionType):
p.setValueToString(str(info[name](p)))

8
SkeinPyPy/newui/configWizard.py
View file

@ -60,10 +60,10 @@ class InfoPage(wx.wizard.WizardPageSimple):
class FirstInfoPage(InfoPage):
def __init__(self, parent):
super(FirstInfoPage, self).__init__(parent, "First time run wizard")
self.AddText('Welcome, and thanks for trying SkeinPyPy!')
self.AddText('Welcome, and thanks for trying Cura!')
self.AddSeperator()
self.AddText('This wizard will help you with the following steps:')
self.AddText('* Configure SkeinPyPy for your machine')
self.AddText('* Configure Cura for your machine')
self.AddText('* Upgrade your firmware')
self.AddText('* Calibrate your machine')
#self.AddText('* Do your first print')
@ -73,7 +73,7 @@ class RepRapInfoPage(InfoPage):
super(RepRapInfoPage, self).__init__(parent, "RepRap information")
self.AddText('Sorry, but this wizard will not help you with\nconfiguring and calibrating your RepRap.')
self.AddSeperator()
self.AddText('You will have to manually install Marlin firmware\nand configure SkeinPyPy.')
self.AddText('You will have to manually install Marlin or Sprinter firmware\nand configure Cura.')
class MachineSelectPage(InfoPage):
def __init__(self, parent):
@ -116,7 +116,7 @@ class FirmwareUpgradePage(InfoPage):
self.AddHiddenSeperator()
self.AddText('The firmware shipping with new Ultimakers works, but upgrades\nhave been made to make better prints, and make calibration easier.')
self.AddHiddenSeperator()
self.AddText('SkeinPyPy requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')
self.AddText('Cura requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')
upgradeButton, skipUpgradeButton = self.AddDualButton('Upgrade to Marlin firmware', 'Skip upgrade')
upgradeButton.Bind(wx.EVT_BUTTON, self.OnUpgradeClick)
skipUpgradeButton.Bind(wx.EVT_BUTTON, self.OnSkipClick)

13
SkeinPyPy/newui/mainWindow.py
View file

@ -13,12 +13,13 @@ from newui import preferencesDialog
from newui import configWizard
from newui import machineCom
from newui import profile
from newui import printWindow
def main():
app = wx.App(False)
if profile.getPreference('wizardDone') == 'False':
if os.name == 'darwin':
wx.MessageBox('The MacOS version of SkeinPyPy is experimental.\nThere are still UI/usability bugs. Check the issue list at:\nhttps://github.com/daid/SkeinPyPy/issues\nfor details.\nPlease report any extra issue you find.', 'MacOS Warning', wx.OK | wx.ICON_INFORMATION)
wx.MessageBox('The MacOS version of Cura is experimental.\nThere are still UI/usability bugs. Check the issue list at:\nhttps://github.com/daid/SkeinPyPy/issues\nfor details.\nPlease report any extra issue you find.', 'MacOS Warning', wx.OK | wx.ICON_INFORMATION)
configWizard.configWizard()
profile.putPreference("wizardDone", "True")
mainWindow()
@ -27,7 +28,7 @@ def main():
class mainWindow(configBase.configWindowBase):
"Main user interface window"
def __init__(self):
super(mainWindow, self).__init__(title='SkeinPyPy')
super(mainWindow, self).__init__(title='Cura')
wx.EVT_CLOSE(self, self.OnClose)
@ -161,8 +162,10 @@ class mainWindow(configBase.configWindowBase):
# load and slice buttons.
loadButton = wx.Button(self, -1, 'Load Model')
sliceButton = wx.Button(self, -1, 'Slice to GCode')
#printButton = wx.Button(self, -1, 'Print GCode')
self.Bind(wx.EVT_BUTTON, self.OnLoadModel, loadButton)
self.Bind(wx.EVT_BUTTON, self.OnSlice, sliceButton)
#self.Bind(wx.EVT_BUTTON, self.OnPrint, printButton)
#Also bind double clicking the 3D preview to load an STL file.
self.preview3d.glCanvas.Bind(wx.EVT_LEFT_DCLICK, self.OnLoadModel, self.preview3d.glCanvas)
@ -174,7 +177,8 @@ class mainWindow(configBase.configWindowBase):
sizer.AddGrowableCol(2)
sizer.AddGrowableRow(0)
sizer.Add(loadButton, (1,1), flag=wx.RIGHT, border=5)
sizer.Add(sliceButton, (1,2))
sizer.Add(sliceButton, (1,2), flag=wx.RIGHT, border=5)
#sizer.Add(printButton, (1,3), flag=wx.RIGHT, border=5)
self.sizer = sizer
if self.filename != "None":
@ -254,6 +258,9 @@ class mainWindow(configBase.configWindowBase):
newSize.IncBy(0, spp.GetSize().GetHeight())
self.SetSize(newSize)
self.progressPanelList.append(spp)
def OnPrint(self, e):
printWindow.printWindow()
def OnExpertOpen(self, e):
acw = advancedConfig.advancedConfigWindow()

2
SkeinPyPy/skeinforge_application/skeinforge_utilities/skeinforge_profile.py
View file

@ -15,7 +15,7 @@ def getCraftTypeName():
return 'extrusion'
def getProfileName(craftTypeName):
return 'SkeinPyPy profile:' + craftTypeName
return 'Cura profile:' + craftTypeName
def addListsToCraftTypeRepository(fileNameHelp, repository):
#print('addListsToCraftTypeRepository:', fileNameHelp, repository)

2
SkeinPyPy/skeinpypy.py
View file

@ -3,7 +3,7 @@
This page is in the table of contents.
==Overview==
===Introduction===
SkeinPyPy is a GPL tool chain to forge a gcode skein for a model. Based on Skeinforge.
Cura is a GPL tool chain to forge a gcode skein for a model. Based on Skeinforge.
The slicing code is the same as Skeinforge. But the UI has been revamped to be... sane.