Changeset 398

Show
Ignore:
Timestamp:
01/13/03 14:37:54 (6 years ago)
Author:
sholloway
Message:

Changed references from Foundation to RBFoundation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBRapier/RBRapier/Formats/Lightwave/MeshedObject.py

    r379 r398  
    4444from RBRapier.Formats import GeoObject 
    4545 
     46from RBFoundation import TaskProgress 
     47 
    4648#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4749#~ Constants / Variables / Etc.  
    …… 
    5456#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5557 
    56 from Foundation import TaskProgress 
    5758class PrintOnTaskProgress(TaskProgress.TaskProgress): 
    5859    Indent = 0 

  • trunk/RBRapier/RBRapier/Renderer/Appearance/Blending.py

    r341 r398  
    2525 
    2626from RBRapier.Renderer.AttributeMgr import AttributeChangeElement 
    27 from Foundation.LazyProperty import LazyProperty 
     27from RBFoundation.LazyProperty import LazyProperty 
    2828from OpenGL import GL 
    2929 

  • trunk/RBRapier/RBRapier/Renderer/Appearance/PointRasterization.py

    r341 r398  
    2525 
    2626from OpenGL import GL 
    27 from Foundation.LazyProperty import LazyProperty 
     27from RBFoundation.LazyProperty import LazyProperty 
    2828from RBRapier.Tools import Vector 
    2929from RBRapier.Renderer.AttributeMgr import AttributeChangeElement 

  • trunk/RBRapier/RBRapier/Renderer/ChangeBaseMgr.py

    r345 r398  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 from Foundation.AOSubjectObserver.StandardSubjects import SubjectList 
    27 from Foundation.LazyProperty import LazyProperty 
     26from RBFoundation.AOSubjectObserver.StandardSubjects import SubjectList 
     27from RBFoundation.LazyProperty import LazyProperty 
    2828 
    2929#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBRapier/RBRapier/Renderer/DisplayList.py

    r382 r398  
    2525 
    2626from OpenGL import GL 
    27 from Foundation.AspectOriented import Aspect 
     27from RBFoundation.AspectOriented import Aspect 
    2828import time 
    2929 

  • trunk/RBRapier/RBRapier/Renderer/Geometry/ArrayTraversal.py

    r383 r398  
    2727import Numeric 
    2828import NumericVertexArray 
    29 from Foundation.AspectOriented import Aspect 
     29from RBFoundation.AspectOriented import Aspect 
    3030 
    3131#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBRapier/RBRapier/Renderer/SequenceMgr.py

    r379 r398  
    2828import bisect 
    2929import weakref 
    30 from Foundation.AOSubjectObserver.StandardSubjects import SubjectList 
     30from RBFoundation.AOSubjectObserver.StandardSubjects import SubjectList 
    3131import StateMgr, AttributeMgr, BufferMgr 
    3232 

  • trunk/RBRapier/RBRapier/Renderer/StateMgr.py

    r345 r398  
    2525 
    2626from OpenGL import GL 
    27 from Foundation.AspectOriented import Aspect 
     27from RBFoundation.AspectOriented import Aspect 
    2828from RBRapier.Renderer.AttributeMgr import AttributeChangeElement 
    2929 

  • trunk/RBRapier/RBRapier/Tools/Geometry/Analysis/TriangleMesh.py

    r366 r398  
    2525 
    2626import weakref 
    27 from Foundation.AspectOriented.FlyweightGroup import FlyweightGroupObject 
     27from RBFoundation.AspectOriented.FlyweightGroup import FlyweightGroupObject 
    2828 
    2929#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBRapier/RBRapier/Tools/Geometry/Synthesis/VertexNormals.py

    r379 r398  
    2727import Numeric 
    2828from RBRapier.Tools.Vector import Vector3 
    29 from Foundation.AspectOriented.FlyweightGroup import FlyweightGroupObject 
     29from RBFoundation.AspectOriented.FlyweightGroup import FlyweightGroupObject 
    3030 
    3131#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBRapier/RBRapier/Tools/Vector.py

    r366 r398  
    2525 
    2626import Numeric 
    27 from Foundation.IndexedProperty import IndexedProperty  
     27from RBFoundation.IndexedProperty import IndexedProperty  
    2828 
    2929#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBRapier/demo/Cube/cubescene.py

    r345 r398  
    2525 
    2626from wxPython import wx 
    27 from Foundation.wxTools.GLViewSetup import GLViewSetup 
     27from RBSkinning.wxTools.GLViewSetup import GLViewSetup 
    2828 
    2929from OpenGL import GL, GLUT 

  • trunk/RBRapier/demo/Cube/simplecube.py

    r343 r398  
    2020##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2121 
    22 from Foundation.Skinning import SkinFile 
     22from RBSkinning import SkinFile 
    2323skin = SkinFile(open('simplecube.skin', 'r')) 
    2424skin.context.application.MainLoop() 

  • trunk/RBRapier/demo/Lightwave/scene.py

    r383 r398  
    2525 
    2626from wxPython import wx 
    27 from Foundation.wxTools.GLViewSetup import GLViewSetup 
     27from RBSkinning.wxTools.GLViewSetup import GLViewSetup 
    2828 
    2929from OpenGL import GL 

  • trunk/RBRapier/demo/Lightwave/simple.py

    r371 r398  
    2020##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2121 
    22 from Foundation.Skinning import SkinFile 
     22from RBSkinning import SkinFile 
     23 
    2324def Run(): 
    2425    skin = SkinFile(open('simple.skin', 'r')) 

  • trunk/RBRapier/demo/Wavefront/scene.py

    r370 r398  
    2525 
    2626from wxPython import wx 
    27 from Foundation.wxTools.GLViewSetup import GLViewSetup 
     27from RBSkinning.wxTools.GLViewSetup import GLViewSetup 
    2828 
    2929from OpenGL import GL 

  • trunk/RBRapier/demo/Wavefront/simple.py

    r345 r398  
    2020##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2121 
    22 from Foundation.Skinning import SkinFile 
     22from RBSkinning import SkinFile 
    2323skin = SkinFile(open('simple.skin', 'r')) 
    2424skin.context.application.MainLoop() 

  • trunk/RBTelepathy/RBTelepathy/Packet/Builder.py

    r391 r398  
    2525 
    2626import weakref 
    27 from Foundation.XMLClassBuilder import *  
     27from RBFoundation.XMLClassBuilder import *  
    2828 
    2929#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBTelepathy/RBTelepathy/Packet/Elements.py

    r391 r398  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 from Foundation.XMLBuilder import XMLBuilderObjectBase 
    27 from Foundation.XMLClassBuilder import XMLClassBuilderObjectMixin 
    28 from Foundation.XMLObjectify import BaseObjectifiedXML, ObjectifiedXML 
     26from RBFoundation.XMLBuilder import XMLBuilderObjectBase 
     27from RBFoundation.XMLClassBuilder import XMLClassBuilderObjectMixin 
     28from RBFoundation.XMLObjectify import BaseObjectifiedXML, ObjectifiedXML 
    2929 
    3030#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    7070        return data 
    7171 
    72     def GetStreamInfo(self): 
     72    def GetStreamHeader(self): 
    7373        return self._toXML() 
    7474 

  • trunk/RBTelepathy/RBTelepathy/Packet/__init__.py

    r391 r398  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 from Foundation.XMLClassBuilder import ElementFactory as EF 
    27 from Foundation.XMLObjectify import BaseObjectifiedXML, ObjectifiedXML 
     26from RBFoundation.XMLClassBuilder import ElementFactory as EF 
     27from RBFoundation.XMLObjectify import BaseObjectifiedXML, ObjectifiedXML 
    2828import Builder 
    2929import MessageElements 
    …… 
    6060StandardElementFactories = { 
    6161    ## Long names 
    62     ('http://namespaces.runeblade.com/RBMessaging', 'msg'): EF.Static(MessageElements.Message), 
    6362    ('http://namespaces.runeblade.com/RBMessaging', 'message'): EF.Static(MessageElements.Message), 
    6463    ('http://namespaces.runeblade.com/RBMessaging', 'stream'): StreamFormatFactory(), 
     64    ('http://namespaces.runeblade.com/RBMessaging', 'error'): EF.Static(ObjectifiedXML), 
    6565 
    6666    ('http://namespaces.runeblade.com/RBMessaging', ): EF.Static(ObjectifiedXML), 
    …… 
    8585    NamespaceSynonyms = Builder.StreamPacketBuilder.NamespaceSynonyms.copy() 
    8686    NamespaceSynonyms.update(StandardNamespaceSynonyms) 
     87 
     88    DefaultNamespace = NamespaceSynonyms[None] 
    8789 
    8890#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBTelepathy/RBTelepathy/Stream/Protocol.py

    r392 r398  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 import Packet 
     26from RBMessaging.Packet import StandardStreamPacketBuilder 
     27from xml.sax.saxutils import escape as xmlescape 
    2728 
    2829#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    3132 
    3233class StreamProtocol(object): 
    33     """ 
    34     <!-- XML Routing Protocol --> 
    35     <info xmlns='http://namespaces.runeblade.com/RBRouter'> 
    36         <address> 
    37             <to>account@network/resource?type=mobile</to> 
    38             <copy>account@network/resource?type=mobile</copy> 
    39         </address> 
    40         <stream format='length' size='3092'/> 
    41     </info> 
    42     \x1F 
    43     message content 
    44     """ 
    45  
    4634    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4735    #~ Constants / Variables / Etc.  
    …… 
    5038    delimiter = '\x1F' # ASCII unit seperator 
    5139    data = None 
    52     packet = None 
     40    currentpacket = None 
    5341 
    5442    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    5745 
    5846    def SendPacket(self, packet): 
    59         data = ''.join((packet.GetInfoStream(), self.delimiter, packet.GetDataStream())) 
     47        data = ''.join((packet.GetStreamHeader(), self.delimiter, packet.GetStreamData())) 
    6048        self.stream.write(data) 
    6149 
    …… 
    6452        else: self.data = streamdata 
    6553 
    66         if self.currnetpacket is None: 
     54        if self.currentpacket is None: 
    6755            try:  
    6856                # Try to seperate the information packet from the data packet 
    …… 
    7361                # We now have our information packet... we can figure out what we 
    7462                # are supposed to do with the content stream now 
    75                 self.currnetpacket = Packet.Packet.Build(self, info) 
    76                 self.currnetpacket.OnStreamData(self.data, self.OnPacketComplete) 
     63                try: 
     64                    self.currentpacket = self._BuildPacket(info) 
     65                    if self.currentpacket is None: 
     66                        self.OnStreamError() 
     67                    else: 
     68                        self.data = self.currentpacket.OnStreamData(self.data, self._OnPacketComplete) 
     69                except Exception, e: 
     70                    self.OnStreamError(e) 
    7771        else: 
    78             self.currnetpacket.OnStreamData(self.data, self.OnPacketComplete) 
     72            self.data = self.currentpacket.OnStreamData(self.data, self._OnPacketComplete) 
     73 
     74    def _OnPacketComplete(self, packet): 
     75        del self.currentpacket 
     76        self.OnPacketComplete(packet) 
    7977 
    8078    def OnPacketComplete(self, packet): 
    81         self.connection.OnStreamPacket(packet) 
    82         del self.currnetpacket 
     79        pass 
    8380 
    84 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    85 #~ Testing  
    86 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     81    def OnStreamError(self, error=None): 
     82        self.stream.write('''<error xmlns='%s'>%s</error>%s''' % (StandardStreamPacketBuilder.DefaultNamespace, xmlescape(str(error or 'Unknown')), self.delimiter)) 
     83        print error 
    8784 
    88 if __name__=='__main__': 
    89     print "Testing..." 
    90     import sys 
    91     import StringIO 
    92     info = '''<info> 
    93     <stream name="one" format="term" ord='#0A'/> 
    94     <stream name="two" format="term" ord='13'/> 
    95 </info>''' 
    96     data = ['Some content\n','Other Stuff\r'] 
    97     packet = Packet.Packet(Packet.InfoPacket.Build(info), data) 
     85    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     86    #~ Protected Methods  
     87    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    9888 
    99     p = StreamProtocol() 
    100     p.stream = StringIO.StringIO() 
    101     p.SendPacket(packet) 
     89    def _BuildPacket(self, info): 
     90        try: 
     91            packetbuilder = self.packetbuilder 
     92        except AttributeError: 
     93            packetbuilder = self.packetbuilder = StandardStreamPacketBuilder() 
     94        self.packetbuilder.BuildPacket(info) 
    10295 
    103     class TestConnection(object): 
    104         def OnStreamPacket(self, packet): 
    105             print 
    106             print packet.info 
    107             for data in packet.data: 
    108                 print '-'*10, data.name, '-'*10 
    109                 print repr(str(data)) 
    110             print 
    111     p.connection = TestConnection() 
    112     p.OnRecvStreamData(p.stream.getvalue()) 
    113     print "Test complete." 
    114  

  • trunk/RBTelepathy/RBTelepathy/Stream/SocketAdaptor.py

    r390 r398  
    2525 
    2626import threading  
    27 import logging 
    28 from Foundation import SmartSelect, LazyProperty 
    29 from Foundation.AOSubjectObserver.StandardSubjects import Subject 
     27from RBFoundation import SmartSelect, LazyProperty 
     28from RBFoundation.AOSubjectObserver.StandardSubjects import Subject 
    3029 
    3130#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    3837    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3938 
    40     _sendData = None 
    41     _log = logging.getLogger('SocketStream') 
     39    _sendData = "" 
    4240 
    4341    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    4846        self._socket = socket 
    4947 
    50     #~ SendData Property ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     48 
     49    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     50    #~ SendData Property 
     51    #~    Abstracts to allow for access control (locking) 
     52    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5153 
    5254    def _getSendData(self): 
    53         if self._sendData is None: 
    54             self._sendData = "" 
    5555        return self._sendData 
    5656    def _setSendData(self, data): 
    …… 
    7676    def _ProcessRead(self, *args, **kw):  
    7777        data = self._SocketRecv(*args, **kw) 
    78         if data: 
    79             self._log.debug('Received %d bytes on %r', len(data), self) 
    80         else: 
     78        if not data: 
    8179            self._socket = None 
    82             self._log.info('Received disconnect on %r', self) 
    8380        self.protocol.OnRecvStreamData(data) 
    8481 
    …… 
    8784    def _ProcessWrite(self, *args, **kw): 
    8885        nSent = self._SocketSend(self._sendData, *args, **kw) 
    89         self._log.debug('Sent %d bytes on %r', nSent, self) 
    9086        self._sendData = self._sendData[nSent:] 
    9187 

  • trunk/RBTelepathy/RBTelepathy/Stream/SocketServer.py

    r392 r398  
    2525 
    2626import weakref 
    27 from Foundation import SmartSelect 
    28 from Foundation.AOSubjectObserver.StandardSubjects import Subject 
     27from RBFoundation import SmartSelect 
     28from RBFoundation.AOSubjectObserver.StandardSubjects import Subject 
    2929 
    3030#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    3232#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3333 
    34 class SocketServer(SmartSelect.SmartSelectCollection): 
     34class SocketServer(SmartSelect.ClientBase): 
    3535    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3636    #~ Public 
    …… 
    3939    def __init__(self, socket): 
    4040        self.serversocket = socket 
    41         self.SelectCollection = SmartSelect.SmartSelectList() 
    42         self.SelectCollection.append(weakref.proxy(self)) 
    4341        self.OnNewConnection = Subject() 
    4442 
    …… 
    8280        socket.send("Thanks for connecting from %r.  Goodbye!" % (info,)) 
    8381        socket.shutdown(0) 
    84         #selecthost.SelectCollection.append(stream) 
    8582 
    8683    server.OnNewConnection.Add(OnNewConnection)