TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make cluster compatible

Browse Source
This commit is contained in:
Mark Mine 2002-12-19 23:17:30 +00:00
parent 096b751815
commit 08fc2c7e5b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/tkpanels/DirectSessionPanel.py
View File

@ -726,6 +726,7 @@ class DirectSessionPanel(AppShell):
dr = self.activeDisplayRegion dr = self.activeDisplayRegion
if dr: if dr:
dr.camLens.setNear(near) dr.camLens.setNear(near)
cluster('base.camLens.setNear(%f)' % near, 0)
def setFar(self, far): def setFar(self, far):
dr = self.activeDisplayRegion dr = self.activeDisplayRegion

26
direct/src/tkpanels/NotifyPanel.py
View File

@ -14,7 +14,7 @@ class NotifyPanel:
# To get severity levels # To get severity levels
from NotifySeverity import NSFatal, NSError, NSWarning, NSInfo from NotifySeverity import NSFatal, NSError, NSWarning, NSInfo
from NotifySeverity import NSDebug, NSSpam from NotifySeverity import NSDebug, NSSpam
if tl == None: if tl == None:
tl = Toplevel() tl = Toplevel()
tl.title('Notify Controls') tl.title('Notify Controls')
@ -48,59 +48,63 @@ class NotifyPanel:
# Create a listbox # Create a listbox
self.categoryList = Pmw.ScrolledListBox( self.categoryList = Pmw.ScrolledListBox(
categoryFrame, categoryFrame,
labelpos = NW, label_text = 'Categories:', labelpos = 'nw', label_text = 'Categories:',
label_font=('MSSansSerif', 10, 'bold'), label_font=('MSSansSerif', 10, 'bold'),
listbox_takefocus = 1, listbox_takefocus = 1,
items = categoryNames, items = categoryNames,
selectioncommand = self.setActivePandaCategory) selectioncommand = self.setActivePandaCategory)
self.categoryList.pack(expand = 1, fill = BOTH) self.categoryList.pack(expand = 1, fill = 'both')
# Severity frame # Severity frame
Label(severityFrame, text = 'Severity:', Label(severityFrame, text = 'Severity:',
font=('MSSansSerif', 10, 'bold'), font=('MSSansSerif', 10, 'bold'),
<<<<<<< NotifyPanel.py
justify = 'right', anchor = 'w').pack(fill = X, padx = 5)
=======
justify = RIGHT, anchor = W).pack( justify = RIGHT, anchor = W).pack(
fill = X, padx = 5) fill = X, padx = 5)
>>>>>>> 1.2
self.severity = IntVar() self.severity = IntVar()
self.severity.set(0) self.severity.set(0)
self.fatalSeverity = Radiobutton(severityFrame, text = 'Fatal', self.fatalSeverity = Radiobutton(severityFrame, text = 'Fatal',
justify = LEFT, anchor = W, justify = 'left', anchor = 'w',
value = NSFatal, value = NSFatal,
variable = self.severity, variable = self.severity,
command = self.setActiveSeverity) command = self.setActiveSeverity)
self.fatalSeverity.pack(fill = X) self.fatalSeverity.pack(fill = X)
self.errorSeverity = Radiobutton(severityFrame, text = 'Error', self.errorSeverity = Radiobutton(severityFrame, text = 'Error',
justify = LEFT, anchor = W, justify = 'left', anchor = 'w',
value = NSError, value = NSError,
variable = self.severity, variable = self.severity,
command = self.setActiveSeverity) command = self.setActiveSeverity)
self.errorSeverity.pack(fill = X) self.errorSeverity.pack(fill = X)
self.warningSeverity = Radiobutton(severityFrame, text = 'Warning', self.warningSeverity = Radiobutton(severityFrame, text = 'Warning',
justify = LEFT, anchor = W, justify = 'left', anchor = 'w',
value = NSWarning, value = NSWarning,
variable = self.severity, variable = self.severity,
command = self.setActiveSeverity) command = self.setActiveSeverity)
self.warningSeverity.pack(fill = X) self.warningSeverity.pack(fill = X)
self.infoSeverity = Radiobutton(severityFrame, text = 'Info', self.infoSeverity = Radiobutton(severityFrame, text = 'Info',
justify = LEFT, anchor = W, justify = 'left', anchor = 'w',
value = NSInfo, value = NSInfo,
variable = self.severity, variable = self.severity,
command = self.setActiveSeverity) command = self.setActiveSeverity)
self.infoSeverity.pack(fill = X) self.infoSeverity.pack(fill = X)
self.debugSeverity = Radiobutton(severityFrame, text = 'Debug', self.debugSeverity = Radiobutton(severityFrame, text = 'Debug',
justify = LEFT, anchor = W, justify = 'left', anchor = 'w',
value = NSDebug, value = NSDebug,
variable = self.severity, variable = self.severity,
command = self.setActiveSeverity) command = self.setActiveSeverity)
self.debugSeverity.pack(fill = X) self.debugSeverity.pack(fill = X)
self.spamSeverity = Radiobutton(severityFrame, text = 'Spam', self.spamSeverity = Radiobutton(severityFrame, text = 'Spam',
justify = LEFT, anchor = W, justify = 'left', anchor = 'w',
value = NSSpam, value = NSSpam,
variable = self.severity, variable = self.severity,
command = self.setActiveSeverity) command = self.setActiveSeverity)
self.spamSeverity.pack(fill = X) self.spamSeverity.pack(fill = X)
# Pack frames # Pack frames
framePane.pack(expand = 1, fill = BOTH) framePane.pack(expand = 1, fill = 'both')
mainFrame.pack(expand = 1, fill = BOTH) mainFrame.pack(expand = 1, fill = 'both')
# Get listbox # Get listbox
listbox = self.categoryList.component('listbox') listbox = self.categoryList.component('listbox')
# Bind updates to arrow buttons # Bind updates to arrow buttons