Mercurial > traipse

diff orpg/mapper/whiteboard.py @ 18:97265586402b ornery-orc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse 'OpenRPG' {090827-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: Update Manager is now in version 0.8. While not every button works, users can now browse the different revisions and their different changesets. The code has been refined some with feature from Core added to it. A Crash report is now created if the users software crashes. Update Manager has been moved to the Traipse Suite menu item, and a Debug Console as been added as well.
author sirebral
date Thu, 27 Aug 2009 01:04:43 -0500
parents 211ac836b6a0
children ff154cf3350c
line wrap: on
line diff
--- a/orpg/mapper/whiteboard.py	Thu Aug 13 13:14:10 2009 -0500
+++ b/orpg/mapper/whiteboard.py	Thu Aug 27 01:04:43 2009 -0500
@@ -43,8 +43,6 @@
 
 class WhiteboardText:
     def __init__(self, id, text_string, pos, style, pointsize, weight, color="#000000", log=None):
-        self.log = log
-        self.log.log("Enter WhiteboardText", ORPG_DEBUG)
         self.scale = 1
         self.r_h = RGBHex()
         self.selected = False
@@ -61,15 +59,11 @@
         r,g,b = self.r_h.rgb_tuple(self.textcolor)
         self.highlight_color = self.r_h.hexstring(r^255, g^255, b^255)
         self.isUpdated = False
-        self.log.log("Exit WhiteboardText", ORPG_DEBUG)
 
     def highlight(self, highlight=True):
-        self.log.log("Enter WhiteboardText->highlight(self, highlight)", ORPG_DEBUG)
         self.highlighted = highlight
-        self.log.log("Exit WhiteboardText->highlight(self, highlight)", ORPG_DEBUG)
 
     def set_text_props(self, text_string, style, point, weight, color="#000000"):
-        self.log.log("Enter WhiteboardText->set_text_props(self, text_string, style, point, weight, color)", ORPG_DEBUG)
         self.text_string = text_string
         self.textcolor = color
         self.style = int(style)
@@ -79,24 +73,18 @@
         self.weight = int(weight)
         self.font.SetWeight(self.weight)
         self.isUpdated = True
-        self.log.log("Exit WhiteboardText->set_text_props(self, text_string, style, point, weight, color)", ORPG_DEBUG)
 
     def hit_test(self, pt, dc):
-        self.log.log("Enter WhiteboardText->hit_test(self, pt, dc)", ORPG_DEBUG)
         rect = self.get_rect(dc)
         result = rect.InsideXY(pt.x, pt.y)
-        self.log.log("Exit WhiteboardText->hit_test(self, pt, dc)", ORPG_DEBUG)
         return result
 
     def get_rect(self, dc):
-        self.log.log("Enter WhiteboardText->get_rect(self, dc)", ORPG_DEBUG)
         dc.SetFont(self.font)
         (w,x,y,z) = dc.GetFullTextExtent(self.text_string)
-        self.log.log("Exit WhiteboardText->get_rect(self, dc)", ORPG_DEBUG)
         return wx.Rect(self.posx,self.posy,w,(x+y+z))
 
     def draw(self, parent, dc, op=wx.COPY):
-        self.log.log("Enter WhiteboardText->draw(self, parent, dc, op)", ORPG_DEBUG)
         self.scale = parent.canvas.layers['grid'].mapscale
         if self.highlighted: textcolor = self.highlight_color
         else: textcolor = self.textcolor
@@ -109,14 +97,10 @@
         dc.SetFont(self.font)
         dc.DrawText(self.text_string, self.posx, self.posy)
         dc.SetTextForeground(wx.Colour(0,0,0))
-        self.log.log("Exit WhiteboardText->draw(self, parent, dc, op)", ORPG_DEBUG)
 
     def toxml(self, action="update"):
-        self.log.log("Enter WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
         if action == "del":
             xml_str = "<text action='del' id='" + str(self.id) + "'/>"
-            self.log.log(xml_str, ORPG_DEBUG)
-            self.log.log("Exit WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
             return xml_str
         xml_str = "<text"
         xml_str += " action='" + action + "'"
@@ -129,47 +113,33 @@
         if self.text_string != None: xml_str+= " text_string='" + self.text_string + "'"
         if self.textcolor != None: xml_str += " color='" + self.textcolor + "'"
         xml_str += "/>"
-        self.log.log(xml_str, ORPG_DEBUG)
-        self.log.log("Exit WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
         if (action == "update" and self.isUpdated) or action == "new":
             self.isUpdated = False
             return xml_str
         else: return ''
 
     def takedom(self, xml_dom):
-        self.log.log("Enter WhiteboardText->takedom(self, xml_dom)", ORPG_DEBUG)
         self.text_string = xml_dom.getAttribute("text_string")
-        self.log.log("self.text_string=" + self.text_string, ORPG_DEBUG)
         self.id = xml_dom.getAttribute("id")
-        self.log.log("self.id=" + str(self.id), ORPG_DEBUG)
         if xml_dom.hasAttribute("posy"):
             self.posy = int(xml_dom.getAttribute("posy"))
-            self.log.log("self.posy=" + str(self.posy), ORPG_DEBUG)
         if xml_dom.hasAttribute("posx"):
             self.posx = int(xml_dom.getAttribute("posx"))
-            self.log.log("self.posx=" + str(self.posx), ORPG_DEBUG)
         if xml_dom.hasAttribute("weight"):
             self.weight = int(xml_dom.getAttribute("weight"))
             self.font.SetWeight(self.weight)
-            self.log.log("self.weight=" + str(self.weight), ORPG_DEBUG)
         if xml_dom.hasAttribute("style"):
             self.style = int(xml_dom.getAttribute("style"))
             self.font.SetStyle(self.style)
-            self.log.log("self.style=" + str(self.style), ORPG_DEBUG)
         if xml_dom.hasAttribute("pointsize"):
             self.pointsize = int(xml_dom.getAttribute("pointsize"))
             self.font.SetPointSize(self.pointsize)
-            self.log.log("self.pointsize=" + str(self.pointsize), ORPG_DEBUG)
         if xml_dom.hasAttribute("color") and xml_dom.getAttribute("color") != '':
             self.textcolor = xml_dom.getAttribute("color")
             if self.textcolor == '#0000000': self.textcolor = '#000000'
-            self.log.log("self.textcolor=" + self.textcolor, ORPG_DEBUG)
-        self.log.log("Exit WhiteboardText->takedom(self, xml_dom)", ORPG_DEBUG)
 
 class WhiteboardLine:
     def __init__(self, id, line_string, upperleft, lowerright, color="#000000", width=1, log=None):
-        self.log = log
-        self.log.log("Enter WhiteboardLine", ORPG_DEBUG)
         self.scale = 1
         self.r_h = RGBHex()
         if color == '': color = "#000000"
@@ -183,16 +153,14 @@
         self.highlighted = False
         r,g,b = self.r_h.rgb_tuple(self.linecolor)
         self.highlight_color = self.r_h.hexstring(r^255, g^255, b^255)
-        self.log.log("Exit WhiteboardLine", ORPG_DEBUG)
 
     def highlight(self, highlight=True):
-        self.log.log("Enter WhiteboardLine->highlight(self, highlight)", ORPG_DEBUG)
         self.highlighted = highlight
-        self.log.log("Enter WhiteboardLine->highlight(self, highlight)", ORPG_DEBUG)
 
-    def set_line_props(self, line_string="", upperleftx=0, upperlefty=0, 
-            lowerrightx=0, lowerrighty=0, color="#000000", width=1):
-        self.log.log("Enter WhiteboardLine->set_line_props(self, line_string, upperleftx, upperlefty, lowerrightx, lowerrighty, color, width)", ORPG_DEBUG)
+    def set_line_props(self, line_string="", 
+                        upperleftx=0, upperlefty=0, 
+                        lowerrightx=0, lowerrighty=0, 
+                        color="#000000", width=1):
         self.line_string = line_string
         self.upperleft.x = upperleftx
         self.upperleft.y = upperlefty
@@ -200,28 +168,22 @@
         self.lowerright.y = lowerrighty
         self.linecolor = color
         self.linewidth = width
-        self.log.log("Exit WhiteboardLine->set_line_props(self, line_string, upperleftx, upperlefty, lowerrightx, lowerrighty, color, width)", ORPG_DEBUG)
 
     def hit_test(self, pt):
-        self.log.log("Enter WhiteboardLine->hit_test(self, pt)", ORPG_DEBUG)
         coords = self.line_string.split(";")
         stcords = coords[0].split(",")
         oldicords = (int(stcords[0]),int(stcords[1]))
         for coordinate_string_counter in range(1, len(coords)):
             stcords = coords[coordinate_string_counter].split(",")
             if stcords[0] == "":
-                self.log.log("Exit WhiteboardLine->hit_test(self, pt) return False", ORPG_DEBUG)
                 return False
             icords = (int(stcords[0]),int(stcords[1]))
             if orpg.mapper.map_utils.proximity_test(oldicords,icords,pt,12):
-                self.log.log("Exit WhiteboardLine->hit_test(self, pt) return True", ORPG_DEBUG)
                 return True
             oldicords = icords
-        self.log.log("Exit WhiteboardLine->hit_test(self, pt) return False", ORPG_DEBUG)
         return False
 
     def draw(self, parent, dc, op=wx.COPY):
-        self.log.log("Enter WhiteboardLine->draw(self, parent, dc, op=wx.COPY)", ORPG_DEBUG)
         self.scale = parent.canvas.layers['grid'].mapscale
         if self.highlighted: linecolor = self.highlight_color
         else: linecolor = self.linecolor
@@ -248,14 +210,10 @@
         dc.SetPen(wx.NullPen)
         dc.SetBrush(wx.NullBrush)
         #selected outline
-        self.log.log("Exit WhiteboardLine->draw(self, parent, dc, op=wx.COPY)", ORPG_DEBUG)
 
     def toxml(self, action="update"):
-        self.log.log("Enter WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
         if action == "del":
             xml_str = "<line action='del' id='" + str(self.id) + "'/>"
-            self.log.log(xml_str, ORPG_DEBUG)
-            self.log.log("Exit WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
             return xml_str
         #  if there are any changes, make sure id is one of them
         xml_str = "<line"
@@ -273,38 +231,26 @@
         if self.linewidth != None:
             xml_str += " width='" + str(self.linewidth) + "'"
         xml_str += "/>"
-        self.log.log(xml_str, ORPG_DEBUG)
-        self.log.log("Exit WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
         if action == "new": return xml_str
         return ''
 
     def takedom(self, xml_dom):
-        self.log.log("Enter WhiteboardLine->takedom(self, xml_dom)", ORPG_DEBUG)
         self.line_string = xml_dom.getAttribute("line_string")
-        self.log.log("self.line_string=" + self.line_string, ORPG_DEBUG)
         self.id = xml_dom.getAttribute("id")
-        self.log.log("self.id=" + str(self.id), ORPG_DEBUG)
         if xml_dom.hasAttribute("upperleftx"):
             self.upperleft.x = int(xml_dom.getAttribute("upperleftx"))
-            self.log.log("self.upperleft.x=" + str(self.upperleft.x), ORPG_DEBUG)
         if xml_dom.hasAttribute("upperlefty"):
             self.upperleft.y = int(xml_dom.getAttribute("upperlefty"))
-            self.log.log("self.upperleft.y=" + str(self.upperleft.y), ORPG_DEBUG)
         if xml_dom.hasAttribute("lowerrightx"):
             self.lowerright.x = int(xml_dom.getAttribute("lowerrightx"))
-            self.log.log("self.lowerright.x=" + str(self.lowerright.x), ORPG_DEBUG)
         if xml_dom.hasAttribute("lowerrighty"):
             self.lowerright.y = int(xml_dom.getAttribute("lowerrighty"))
-            self.log.log("self.lowerright.y=" + str(self.lowerright.y), ORPG_DEBUG)
         if xml_dom.hasAttribute("color") and xml_dom.getAttribute("color") != '':
             self.linecolor = xml_dom.getAttribute("color")
             if self.linecolor == '#0000000':
                 self.linecolor = '#000000'
-            self.log.log("self.linecolor=" + self.linecolor, ORPG_DEBUG)
         if xml_dom.hasAttribute("width"):
             self.linewidth = int(xml_dom.getAttribute("width"))
-            self.log.log("self.linewidth=" + str(self.linewidth), ORPG_DEBUG)
-        self.log.log("Exit WhiteboardLine->takedom(self, xml_dom)", ORPG_DEBUG)
 
 ##-----------------------------
 ## whiteboard layer
@@ -313,8 +259,6 @@
 
     def __init__(self, canvas):
         self.canvas = canvas
-        self.log = self.canvas.log
-        self.log.log("Enter whiteboard_layer", ORPG_DEBUG)
         layer_base.__init__(self)
         self.r_h = RGBHex()
         self.id = -1
@@ -324,64 +268,48 @@
         self.color = "#000000"
         self.width = 1
         self.removedLines = []
-        self.log.log("Exit whiteboard_layer", ORPG_DEBUG)
 
     def next_serial(self):
-        self.log.log("Enter whiteboard_layer->next_serial(self)", ORPG_DEBUG)
         self.serial_number += 1
-        self.log.log("Exit whiteboard_layer->next_serial(self)", ORPG_DEBUG)
         return self.serial_number
 
     def get_next_highest_z(self):
-        self.log.log("Enter whiteboard_layer->get_next_highest_z(self)", ORPG_DEBUG)
         z = len(self.lines)+1
-        self.log.log("Exit whiteboard_layer->get_next_highest_z(self)", ORPG_DEBUG)
         return z
 
     def cleanly_collapse_zorder(self):
-        self.log.log("Enter/Exit whiteboard_layer->cleanly_collapse_zorder(self)", ORPG_DEBUG)
+        pass
 
     def collapse_zorder(self):
-        self.log.log("Enter/Exit whiteboard_layer->collapse_zorder(self)", ORPG_DEBUG)
+        pass
 
     def rollback_serial(self):
-        self.log.log("Enter whiteboard_layer->rollback_serial(self)", ORPG_DEBUG)
         self.serial_number -= 1
-        self.log.log("Exit whiteboard_layer->rollback_serial(self)", ORPG_DEBUG)
 
     def add_line(self, line_string="", upperleft=cmpPoint(0,0), lowerright=cmpPoint(0,0), color="#000000", width=1):
-        self.log.log("Enter whiteboard_layer->add_line(self, line_string, upperleft, lowerright, color, width)", ORPG_DEBUG)
         id = 'line-' + str(self.next_serial())
-        line = WhiteboardLine(id, line_string, upperleft, lowerright, color=self.color, width=self.width, log=self.log)
+        line = WhiteboardLine(id, line_string, upperleft, lowerright, color=self.color, width=self.width)
         self.lines.append(line)
         xml_str = "<map><whiteboard>"
         xml_str += line.toxml("new")
         xml_str += "</whiteboard></map>"
         self.canvas.frame.session.send(xml_str)
         self.canvas.Refresh(True)
-        self.log.log("Exit whiteboard_layer->add_line(self, line_string, upperleft, lowerright, color, width)", ORPG_DEBUG)
         return line
 
     def get_line_by_id(self, id):
-        self.log.log("Enter whiteboard_layer->get_line_by_id(self, id)", ORPG_DEBUG)
         for line in self.lines:
             if str(line.id) == str(id):
-                self.log.log("Exit whiteboard_layer->get_line_by_id(self, id) return LineID: " + str(id), ORPG_DEBUG)
                 return line
-        self.log.log("Exit whiteboard_layer->get_line_by_id(self, id) return None", ORPG_DEBUG)
         return None
 
     def get_text_by_id(self, id):
-        self.log.log("Enter whiteboard_layer->get_text_by_id(self, id)", ORPG_DEBUG)
         for text in self.texts:
             if str(text.id) == str(id):
-                self.log.log("Exit whiteboard_layer->get_text_by_id(self, id) return textID: " + str(id), ORPG_DEBUG)
                 return text
-        self.log.log("Enter whiteboard_layer->get_text_by_id(self, id) return None", ORPG_DEBUG)
         return None
 
     def del_line(self, line):
-        self.log.log("Enter whiteboard_layer->del_line(self, line)", ORPG_DEBUG)
         xml_str = "<map><whiteboard>"
         xml_str += line.toxml("del")
         xml_str += "</whiteboard></map>"
@@ -390,7 +318,6 @@
             self.lines.remove(line)
             self.removedLines.append(line)
         self.canvas.Refresh(True)
-        self.log.log("Exit whiteboard_layer->del_line(self, line)", ORPG_DEBUG)
 
     def undo_line(self):
         if len(self.removedLines)>0:
@@ -400,14 +327,11 @@
             self.canvas.Refresh(True)
 
     def del_all_lines(self):
-        self.log.log("Enter whiteboard_layer->del_all_lines(self)", ORPG_DEBUG)
         for i in xrange(len(self.lines)):
             self.del_line(self.lines[0])
         print self.lines
-        self.log.log("Exit whiteboard_layer->del_all_lines(self)", ORPG_DEBUG)
 
     def del_text(self, text):
-        self.log.log("Enter whiteboard_layer->del_text(self, text)", ORPG_DEBUG)
         xml_str = "<map><whiteboard>"
         xml_str += text.toxml("del")
         xml_str += "</whiteboard></map>"
@@ -415,87 +339,64 @@
         if text:
             self.texts.remove(text)
         self.canvas.Refresh(True)
-        self.log.log("Exit whiteboard_layer->del_text(self, text)", ORPG_DEBUG)
 
     def layerDraw(self, dc):
-        self.log.log("Enter whiteboard_layer->layerDraw(self, dc)", ORPG_DEBUG)
         for m in self.lines: m.draw(self, dc)
         for m in self.texts: m.draw(self,dc)
-        self.log.log("Exit whiteboard_layer->layerDraw(self, dc)", ORPG_DEBUG)
 
     def hit_test_text(self, pos, dc):
-        self.log.log("Enter whiteboard_layer->hit_test_text(self, pos, dc)", ORPG_DEBUG)
         list_of_texts_matching = []
         if self.canvas.layers['fog'].use_fog == 1:
             if self.canvas.frame.session.role != "GM":
-                self.log.log("Exit whiteboard_layer->hit_test_text(self, pos, dc)", ORPG_DEBUG)
                 return list_of_texts_matching
         for m in self.texts:
             if m.hit_test(pos,dc): list_of_texts_matching.append(m)
-        self.log.log("Exit whiteboard_layer->hit_test_text(self, pos, dc)", ORPG_DEBUG)
         return list_of_texts_matching
 
     def hit_test_lines(self, pos, dc):
-        self.log.log("Enter whiteboard_layer->hit_test_lines(self, pos, dc)", ORPG_DEBUG)
         list_of_lines_matching = []
         if self.canvas.layers['fog'].use_fog == 1:
             if self.canvas.frame.session.role != "GM":
-                self.log.log("Exit whiteboard_layer->hit_test_lines(self, pos, dc)", ORPG_DEBUG)
                 return list_of_lines_matching
         for m in self.lines:
             if m.hit_test(pos): list_of_lines_matching.append(m)
-        self.log.log("Exit whiteboard_layer->hit_test_lines(self, pos, dc)", ORPG_DEBUG)
         return list_of_lines_matching
 
     def find_line(self, pt):
-        self.log.log("Enter whiteboard_layer->find_line(self, pt)", ORPG_DEBUG)
         scale = self.canvas.layers['grid'].mapscale
         dc = wx.ClientDC( self.canvas )
         self.canvas.PrepareDC( dc )
         dc.SetUserScale(scale,scale)
         line_list = self.hit_test_lines(pt,dc)
         if line_list:
-            self.log.log("Exit whiteboard_layer->find_line(self, pt)", ORPG_DEBUG)
             return line_list[0]
         else:
-            self.log.log("Exit whiteboard_layer->find_line(self, pt) return None", ORPG_DEBUG)
             return None
 
     def setcolor(self, color):
-        self.log.log("Enter whiteboard_layer->setcolor(self, color)", ORPG_DEBUG)
         r,g,b = color.Get()
         self.color = self.r_h.hexstring(r,g,b)
-        self.log.log("Exit whiteboard_layer->setcolor(self, color)", ORPG_DEBUG)
 
     def sethexcolor(self, hexcolor):
-        self.log.log("Enter whiteboard_layer->sethexcolor(self, hexcolor)", ORPG_DEBUG)
         self.color = hexcolor
-        self.log.log("Exit whiteboard_layer->sethexcolor(self, hexcolor)", ORPG_DEBUG)
 
     def setwidth(self, width):
-        self.log.log("Enter whiteboard_layer->setwidth(self, width)", ORPG_DEBUG)
         self.width = int(width)
-        self.log.log("Exit whiteboard_layer->setwidth(self, width)", ORPG_DEBUG)
 
     def set_font(self, font):
-        self.log.log("Enter whiteboard_layer->set_font(self, font)", ORPG_DEBUG)
         self.font = font
-        self.log.log("Exit whiteboard_layer->set_font(self, font)", ORPG_DEBUG)
 
     def add_text(self, text_string, pos, style, pointsize, weight, color="#000000"):
-        self.log.log("Enter whiteboard_layer->add_text(self, text_string, pos, style, pointsize, weight, color)", ORPG_DEBUG)
         id = 'text-' + str(self.next_serial())
-        text = WhiteboardText(id,text_string, pos, style, pointsize, weight, color, self.log)
+        text = WhiteboardText(id,text_string, pos, style, pointsize, weight, color)
         self.texts.append(text)
         xml_str = "<map><whiteboard>"
         xml_str += text.toxml("new")
         xml_str += "</whiteboard></map>"
         self.canvas.frame.session.send(xml_str)
         self.canvas.Refresh(True)
-        self.log.log("Exit whiteboard_layer->add_text(self, text_string, pos, style, pointsize, weight, color)", ORPG_DEBUG)
 
     def draw_working_line(self, dc, line_string):
-        self.log.log("Enter whiteboard_layer->draw_working_line(self, dc, line_string)", ORPG_DEBUG)
         scale = self.canvas.layers['grid'].mapscale
         dc.SetPen(wx.BLACK_PEN)
         dc.SetBrush(wx.BLACK_BRUSH)
@@ -517,11 +418,9 @@
             y2 = y1
         dc.SetPen(wx.NullPen)
         dc.SetBrush(wx.NullBrush)
-        self.log.log("Exit whiteboard_layer->draw_working_line(self, dc, line_string)", ORPG_DEBUG)
 
     def layerToXML(self, action="update"):
         """ format  """
-        self.log.log("Enter whiteboard_layer->layerToXML(self, " + action + ")", ORPG_DEBUG)
         white_string = ""
         if self.lines:
             for l in self.lines: white_string += l.toxml(action)
@@ -533,15 +432,11 @@
             s += ">"
             s += white_string
             s += "</whiteboard>"
-            self.log.log(s, ORPG_DEBUG)
-            self.log.log("Exit whiteboard_layer->layerToXML(self, " + action + ")", ORPG_DEBUG)
             return s
         else:
-            self.log.log("Exit whiteboard_layer->layerToXML(self, " + action + ")", ORPG_DEBUG)
             return ""
 
     def layerTakeDOM(self, xml_dom):
-        self.log.log("Enter whiteboard_layer->layerTakeDOM(self, xml_dom)", ORPG_DEBUG)
         serial_number = xml_dom.getAttribute('serial')
         if serial_number != "": self.serial_number = int(serial_number)
         children = xml_dom._get_childNodes()
@@ -553,12 +448,9 @@
                 if nodename == 'line':
                     line = self.get_line_by_id(id)
                     if line != None: self.lines.remove(line)
-                    else: self.log.log("Whiteboard error: Deletion of unknown line object attempted.", ORPG_GENERAL)
                 elif nodename == 'text':
                     text = self.get_text_by_id(id)
                     if text != None: self.texts.remove(text)
-                    else: self.log.log("Whiteboard error: Deletion of unknown text object attempted.", ORPG_GENERAL)
-                else: self.log.log("Whiteboard error: Deletion of unknown whiteboard object attempted.", ORPG_GENERAL)
             elif action == "new":
                 if nodename == "line":
                     try:
@@ -575,10 +467,8 @@
                         width = int(l.getAttribute('width'))
                     except:
                         line_string = upperleftx = upperlefty = lowerrightx = lowerrighty = color = 0
-                        self.log.log(traceback.format_exc(), ORPG_GENERAL)
-                        self.log.log("invalid line", ORPG_GENERAL)
                         continue
-                    line = WhiteboardLine(id, line_string, upperleft, lowerright, color, width, self.log)
+                    line = WhiteboardLine(id, line_string, upperleft, lowerright, color, width)
                     self.lines.append(line)
                 elif nodename == "text":
                     try:
@@ -595,26 +485,21 @@
                         pos.x = int(posx)
                         pos.y = int(posy)
                     except:
-                        self.log.log(traceback.format_exc(), ORPG_GENERAL)
-                        self.log.log("invalid line", ORPG_GENERAL)
                         continue
-                    text = WhiteboardText(id, text_string, pos, style, pointsize, weight, color, self.log)
+                    text = WhiteboardText(id, text_string, pos, style, pointsize, weight, color)
                     self.texts.append(text)
             else:
                 if nodename == "line":
                     line = self.get_line_by_id(id)
                     if line: line.takedom(l)
-                    else: self.log.log("Whiteboard error: Update of unknown line attempted.", ORPG_GENERAL)
                 if nodename == "text":
                     text = self.get_text_by_id(id)
                     if text: text.takedom(l)
-                    else: self.log.log("Whiteboard error: Update of unknown text attempted.", ORPG_GENERAL)
-        self.log.log("Enter whiteboard_layer->layerTakeDOM(self, xml_dom)", ORPG_DEBUG)
         #self.canvas.send_map_data()
 
     def add_temp_line(self, line_string):
         line = WhiteboardLine(0, line_string, wx.Point(0,0), wx.Point(0,0), 
-            color=self.color, width=self.width, log=self.log)
+            color=self.color, width=self.width)
         self.lines.append(line)
         return line