Add direct control buttons to print window (needs icons :P). Add project planner to file menu.
parent
5a721aaeb8
commit
9f004dfdfe
|
@ -14,6 +14,7 @@ from gui import configWizard
|
||||||
from gui import machineCom
|
from gui import machineCom
|
||||||
from gui import printWindow
|
from gui import printWindow
|
||||||
from gui import simpleMode
|
from gui import simpleMode
|
||||||
|
from gui import projectPlanner
|
||||||
from gui import icon
|
from gui import icon
|
||||||
from util import profile
|
from util import profile
|
||||||
from util import version
|
from util import version
|
||||||
|
@ -50,6 +51,9 @@ class mainWindow(configBase.configWindowBase):
|
||||||
i = fileMenu.Append(-1, 'Preferences...')
|
i = fileMenu.Append(-1, 'Preferences...')
|
||||||
self.Bind(wx.EVT_MENU, self.OnPreferences, i)
|
self.Bind(wx.EVT_MENU, self.OnPreferences, i)
|
||||||
fileMenu.AppendSeparator()
|
fileMenu.AppendSeparator()
|
||||||
|
i = fileMenu.Append(-1, 'Open project planner...')
|
||||||
|
self.Bind(wx.EVT_MENU, self.OnProjectPlanner, i)
|
||||||
|
fileMenu.AppendSeparator()
|
||||||
i = fileMenu.Append(wx.ID_EXIT, 'Quit')
|
i = fileMenu.Append(wx.ID_EXIT, 'Quit')
|
||||||
self.Bind(wx.EVT_MENU, self.OnQuit, i)
|
self.Bind(wx.EVT_MENU, self.OnQuit, i)
|
||||||
menubar.Append(fileMenu, '&File')
|
menubar.Append(fileMenu, '&File')
|
||||||
|
@ -297,6 +301,11 @@ class mainWindow(configBase.configWindowBase):
|
||||||
ecw.Centre()
|
ecw.Centre()
|
||||||
ecw.Show(True)
|
ecw.Show(True)
|
||||||
|
|
||||||
|
def OnProjectPlanner(self, e):
|
||||||
|
pp = projectPlanner.projectPlanner()
|
||||||
|
pp.Centre()
|
||||||
|
pp.Show(True)
|
||||||
|
|
||||||
def removeSliceProgress(self, spp):
|
def removeSliceProgress(self, spp):
|
||||||
self.progressPanelList.remove(spp)
|
self.progressPanelList.remove(spp)
|
||||||
newSize = self.GetSize();
|
newSize = self.GetSize();
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
import __init__
|
import __init__
|
||||||
|
|
||||||
import wx, threading, re, subprocess, sys
|
import wx, threading, re, subprocess, sys, os
|
||||||
|
from wx.lib import buttons
|
||||||
|
|
||||||
from gui import machineCom
|
from gui import machineCom
|
||||||
from gui import icon
|
from gui import icon
|
||||||
|
@ -50,6 +51,23 @@ class printProcessMonitor():
|
||||||
self.handle = None
|
self.handle = None
|
||||||
self.thread = None
|
self.thread = None
|
||||||
|
|
||||||
|
class PrintCommandButton(buttons.GenBitmapButton):
|
||||||
|
def __init__(self, parent, command, bitmapFilename, size=(20,20)):
|
||||||
|
self.bitmap = wx.Bitmap(os.path.join(os.path.split(__file__)[0], "../images", bitmapFilename))
|
||||||
|
super(PrintCommandButton, self).__init__(parent.directControlPanel, -1, self.bitmap, size=size)
|
||||||
|
|
||||||
|
self.command = command
|
||||||
|
self.parent = parent
|
||||||
|
|
||||||
|
self.SetBezelWidth(1)
|
||||||
|
self.SetUseFocusIndicator(False)
|
||||||
|
|
||||||
|
self.Bind(wx.EVT_BUTTON, self.OnClick)
|
||||||
|
|
||||||
|
def OnClick(self, e):
|
||||||
|
self.parent.sendCommand(self.command)
|
||||||
|
e.Skip()
|
||||||
|
|
||||||
class printWindow(wx.Frame):
|
class printWindow(wx.Frame):
|
||||||
"Main user interface window"
|
"Main user interface window"
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -99,6 +117,35 @@ class printWindow(wx.Frame):
|
||||||
self.sizer.Add(wx.StaticText(self.panel, -1, "Temp:"), pos=(0,3))
|
self.sizer.Add(wx.StaticText(self.panel, -1, "Temp:"), pos=(0,3))
|
||||||
self.sizer.Add(self.temperatureSelect, pos=(0,4))
|
self.sizer.Add(self.temperatureSelect, pos=(0,4))
|
||||||
|
|
||||||
|
self.directControlPanel = wx.Panel(self.panel)
|
||||||
|
self.sizer.Add(self.directControlPanel, pos=(1,3), span=(5,4))
|
||||||
|
|
||||||
|
sizer = wx.GridBagSizer(2, 2)
|
||||||
|
self.directControlPanel.SetSizer(sizer)
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Y100 F6000', 'object-mul-y-add.png'), pos=(0,3))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Y10 F6000', 'object-mul-y-add.png'), pos=(1,3))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Y1 F6000', 'object-mul-y-add.png'), pos=(2,3))
|
||||||
|
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Y-1 F6000', 'object-mul-y-sub.png'), pos=(4,3))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Y-10 F6000', 'object-mul-y-sub.png'), pos=(5,3))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Y-100 F6000', 'object-mul-y-sub.png'), pos=(6,3))
|
||||||
|
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 X-100 F6000', 'object-mul-x-sub.png'), pos=(3,0))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 X-10 F6000', 'object-mul-x-sub.png'), pos=(3,1))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 X-1 F6000', 'object-mul-x-sub.png'), pos=(3,2))
|
||||||
|
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 X1 F6000', 'object-mul-x-add.png'), pos=(3,4))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 X10 F6000', 'object-mul-x-add.png'), pos=(3,5))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 X100 F6000', 'object-mul-x-add.png'), pos=(3,6))
|
||||||
|
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Z10 F200', 'object-max-size.png'), pos=(0,6))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Z1 F200', 'object-max-size.png'), pos=(1,6))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Z0.1 F200', 'object-max-size.png'), pos=(2,6))
|
||||||
|
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Z0.1 F200', 'object-max-size.png'), pos=(4,6))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Z1 F200', 'object-max-size.png'), pos=(5,6))
|
||||||
|
sizer.Add(PrintCommandButton(self, 'G1 Z10 F200', 'object-max-size.png'), pos=(6,6))
|
||||||
|
|
||||||
self.sizer.AddGrowableRow(3)
|
self.sizer.AddGrowableRow(3)
|
||||||
self.sizer.AddGrowableCol(0)
|
self.sizer.AddGrowableCol(0)
|
||||||
|
|
||||||
|
@ -122,6 +169,8 @@ class printWindow(wx.Frame):
|
||||||
#self.loadButton.Enable(self.printIdx == None)
|
#self.loadButton.Enable(self.printIdx == None)
|
||||||
self.printButton.Enable(self.machineConnected and self.gcodeList != None and self.printIdx == None)
|
self.printButton.Enable(self.machineConnected and self.gcodeList != None and self.printIdx == None)
|
||||||
self.cancelButton.Enable(self.printIdx != None)
|
self.cancelButton.Enable(self.printIdx != None)
|
||||||
|
self.temperatureSelect.Enable(self.machineConnected)
|
||||||
|
self.directControlPanel.Enable(self.machineConnected)
|
||||||
|
|
||||||
def UpdateProgress(self):
|
def UpdateProgress(self):
|
||||||
status = ""
|
status = ""
|
||||||
|
|
|
@ -56,7 +56,7 @@ class projectPlanner(wx.Frame):
|
||||||
|
|
||||||
group = []
|
group = []
|
||||||
toolbarUtil.RadioButton(self.toolbar, group, 'object-3d-on.png', 'object-3d-off.png', '3D view', callback=self.On3DClick)
|
toolbarUtil.RadioButton(self.toolbar, group, 'object-3d-on.png', 'object-3d-off.png', '3D view', callback=self.On3DClick)
|
||||||
toolbarUtil.RadioButton(self.toolbar, group, 'object-top-on.png', 'object-top-off.png', 'Topdown view', callback=self.OnTopClick)
|
toolbarUtil.RadioButton(self.toolbar, group, 'object-top-on.png', 'object-top-off.png', 'Topdown view', callback=self.OnTopClick).SetValue(True)
|
||||||
|
|
||||||
self.toolbar.Realize()
|
self.toolbar.Realize()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue