Changeset 8794

Show
Ignore:
Timestamp:
02/25/09 22:01:08 (4 years ago)
Author:
hvolos
Message:

rc2007_gui is now OSSIETalk

Location:
ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk
Files:
6 modified
4 moved

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/Makefile.am

    r5555 r8794  
    11 
    2 ossieName = rc2007_gui 
     2ossieName = OSSIETalk 
    33 
    44xmldir = $(prefix)/xml/$(ossieName) 
    55pydir = $(prefix)/bin/$(ossieName) 
    66dist_xml_DATA =             \ 
    7     rc2007_gui.prf.xml      \ 
    8     rc2007_gui.scd.xml      \ 
    9     rc2007_gui.spd.xml 
     7    OSSIETalk.prf.xml      \ 
     8    OSSIETalk.scd.xml      \ 
     9    OSSIETalk.spd.xml 
    1010 
    1111dist_py_DATA =              \ 
    1212    cvsd.py                 \ 
    1313    port_impl.py            \ 
    14     rc2007_gui.py           \ 
     14    OSSIETalk.py           \ 
    1515    WorkModules.py          \ 
    1616    wx_inits.py 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/OSSIETalk.py

    r8579 r8794  
    66Copyright 2007 Virginia Polytechnic Institute and State University 
    77 
    8 This file is part of the OSSIE rc2007_gui. 
    9  
    10 OSSIE rc2007_gui is free software; you can redistribute it and/or modify 
     8This file is part of the OSSIE OSSIETalk. 
     9 
     10OSSIE OSSIETalk is free software; you can redistribute it and/or modify 
    1111it under the terms of the GNU General Public License as published by 
    1212the Free Software Foundation; either version 2 of the License, or 
    1313(at your option) any later version. 
    1414 
    15 OSSIE rc2007_gui is distributed in the hope that it will be useful, 
     15OSSIE OSSIETalk is distributed in the hope that it will be useful, 
    1616but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1717MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1919 
    2020You should have received a copy of the GNU General Public License 
    21 along with OSSIE rc2007_gui; if not, write to the Free Software 
     21along with OSSIE OSSIETalk; if not, write to the Free Software 
    2222Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2323 
    … …  
    4141 
    4242#------------------------------------------------------------- 
    43 # rc2007_gui_i class definition (main component class) 
     43# OSSIETalk_i class definition (main component class) 
    4444#------------------------------------------------------------- 
    45 class rc2007_gui_i(CF__POA.Resource): 
     45class OSSIETalk_i(CF__POA.Resource): 
    4646    def __init__(self, prnt_orb, uuid, label, poa): 
    4747        CF._objref_Resource.__init__(self._this()) 
    48         print "rc2007_gui_i __init__: " + label 
     48        print "OSSIETalk_i __init__: " + label 
    4949        self.naming_service_name = label 
    5050        self.poa = poa 
    … …  
    9191 
    9292    def start(self): 
    93         print "rc2007_gui start called" 
     93        print "OSSIETalk start called" 
    9494  
    9595    def stop(self): 
    96         print "rc2007_gui stop called" 
     96        print "OSSIETalk stop called" 
    9797         
    9898    def getPort(self, id): 
    … …  
    109109         
    110110    def initialize(self): 
    111         print "rc2007_gui initialize called" 
     111        print "OSSIETalk initialize called" 
    112112     
    113113    def configure(self, props): 
    … …  
    120120        '''  
    121121        
    122         print "rc2007_gui configure called" 
     122        print "OSSIETalk configure called" 
    123123         
    124124        if not self.prntAppReferenced: 
    … …  
    189189         
    190190    # create the main component object 
    191     orb_ref.rc2007_gui_Obj = rc2007_gui_i(orb_ref, uuid, label, obj_poa) 
    192     rc2007_gui_var = orb_ref.rc2007_gui_Obj._this() 
     191    orb_ref.OSSIETalk_Obj = OSSIETalk_i(orb_ref, uuid, label, obj_poa) 
     192    OSSIETalk_var = orb_ref.OSSIETalk_Obj._this() 
    193193         
    194194    name = URI.stringToName(label) 
    195     rootContext.rebind(name, rc2007_gui_var) 
     195    rootContext.rebind(name, OSSIETalk_var) 
    196196 
    197197    orb_ref.orb.run() 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/OSSIETalk.scd.xml

    r5370 r8794  
    1414        <supportsinterface repid="IDL:CF/TestableObject:1.0" supportsname="TestableObject"/> 
    1515        <ports> 
    16             <provides providesname="from_CVSD" repid="IDL:standardInterfaces/realChar:1.0"> 
    17                 <porttype type="data"/> 
    18             </provides> 
    1916            <provides providesname="from_radio" repid="IDL:standardInterfaces/realChar:1.0"> 
    2017                <porttype type="data"/> 
    2118            </provides> 
    2219            <uses repid="IDL:standardInterfaces/realChar:1.0" usesname="to_radio"> 
    23                 <porttype type="data"/> 
    24             </uses> 
    25             <uses repid="IDL:standardInterfaces/realChar:1.0" usesname="to_CVSD"> 
    2620                <porttype type="data"/> 
    2721            </uses> 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/OSSIETalk.spd.xml

    r6896 r8794  
    33<!--Created with OSSIE WaveDev Beta Version 0.6.0b--> 
    44<!--Powered by Python--> 
    5 <softpkg id="DCE:92f16310-5309-11dc-99d1-00123f573a7f" name="rc2007_gui"> 
     5<softpkg id="DCE:82f16310-5309-11dc-99d1-00123f573a7f" name="OSSIETalk"> 
    66    <title/> 
    77    <description>GUI for the 2007 radio challenge </description>  
    … …  
    1212    </author> 
    1313    <propertyfile type="PRF"> 
    14         <localfile name="xml/rc2007_gui/rc2007_gui.prf.xml"/> 
     14        <localfile name="xml/OSSIETalk/OSSIETalk.prf.xml"/> 
    1515    </propertyfile> 
    1616    <descriptor> 
    17         <localfile name="xml/rc2007_gui/rc2007_gui.scd.xml"/> 
     17        <localfile name="xml/OSSIETalk/OSSIETalk.scd.xml"/> 
    1818    </descriptor> 
    19     <implementation id="DCE:92f2a4c8-5309-11dc-82ac-00123f573a7f"> 
     19    <implementation id="DCE:82f2a4c8-5309-11dc-82ac-00123f573a7f"> 
    2020        <description>Description</description>  
    2121        <code type="Executable"> 
    22             <localfile name="bin/rc2007_gui/rc2007_gui.py"/> 
     22            <localfile name="bin/OSSIETalk/OSSIETalk.py"/> 
    2323        </code> 
    2424        <processor name="x86"/> 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/WorkModules.py

    r8787 r8794  
    55Copyright 2007 Virginia Polytechnic Institute and State University 
    66 
    7 This file is part of the OSSIE rc2007_gui. 
    8  
    9 OSSIE rc2007_gui is free software; you can redistribute it and/or modify 
     7This file is part of the OSSIE OSSIETalk. 
     8 
     9OSSIE OSSIETalk is free software; you can redistribute it and/or modify 
    1010it under the terms of the GNU General Public License as published by 
    1111the Free Software Foundation; either version 2 of the License, or 
    1212(at your option) any later version. 
    1313 
    14 OSSIE rc2007_gui is distributed in the hope that it will be useful, 
     14OSSIE OSSIETalk is distributed in the hope that it will be useful, 
    1515but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1616MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1818 
    1919You should have received a copy of the GNU General Public License 
    20 along with OSSIE rc2007_gui; if not, write to the Free Software 
     20along with OSSIE OSSIETalk; if not, write to the Free Software 
    2121Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2222 
    … …  
    3838import copy 
    3939 
    40 import cvsd     # this is in my rc2007_gui package directory 
     40import cvsd     #  
    4141 
    4242import pprint 
    … …  
    106106class txWorkClass: 
    107107 
    108     def __init__(self, rc2007_gui_ref): 
     108    def __init__(self, OSSIETalk_ref): 
    109109        '''Initialization.  Sets a reference to parent.   
    110110        Initializes the buffer.  Starts the Process data 
    111111        thread, which waits for data to be added to the buffer''' 
    112112 
    113         self.rc2007_gui_ref = rc2007_gui_ref 
     113        self.OSSIETalk_ref = OSSIETalk_ref 
    114114     
    115115        # open the capture device and set properties 
    … …  
    182182        #HVself.text_metadata.app_id = 2 
    183183        #HVself.text_metadata.packet_id += 1 
    184         #HVself.rc2007_gui_ref.to_radio_port_servant.send_data( 
     184        #HVself.OSSIETalk_ref.to_radio_port_servant.send_data( 
    185185        #        text, 
    186186        #        copy.copy(self.text_metadata)) 
    187         self.rc2007_gui_ref.to_radio_port_servant.send_data(text) 
     187        self.OSSIETalk_ref.to_radio_port_servant.send_data(text) 
    188188     
    189189    def Release(self): 
    … …  
    207207                # because I can't have this changing on me half- 
    208208                # way through                 
    209                 current_talk_flag = self.rc2007_gui_ref.talk_flag 
     209                current_talk_flag = self.OSSIETalk_ref.talk_flag 
    210210 
    211211                # forwarding voice data: 
    … …  
    230230                    #HV self.audio_metadata.eom = False 
    231231 
    232                     if self.rc2007_gui_ref.to_radio_port_active: 
     232                    if self.OSSIETalk_ref.to_radio_port_active: 
    233233                        #print "audio length: " + str(len(data)) 
    234                         self.rc2007_gui_ref.to_radio_port_servant.send_data(data) 
     234                        self.OSSIETalk_ref.to_radio_port_servant.send_data(data) 
    235235 
    236236                if current_talk_flag == False and previous_talk_flag == True: 
    … …  
    253253                    #HV self.audio_metadata.eom = True 
    254254 
    255                     if self.rc2007_gui_ref.to_radio_port_active: 
     255                    if self.OSSIETalk_ref.to_radio_port_active: 
    256256                        #print "audio length: " + str(len(data)) 
    257                         #HV self.rc2007_gui_ref.to_radio_port_servant.send_data( 
     257                        #HV self.OSSIETalk_ref.to_radio_port_servant.send_data( 
    258258                        #HV        data, copy.copy(self.audio_metadata)) 
    259                           self.rc2007_gui_ref.to_radio_port_servant.send_data(data)         
     259                          self.OSSIETalk_ref.to_radio_port_servant.send_data(data)         
    260260                                 
    261261 
    … …  
    271271class rxWorkClass: 
    272272 
    273     def __init__(self, rc2007_gui_ref): 
     273    def __init__(self, OSSIETalk_ref): 
    274274        '''Initialization.  Sets a reference to parent.   
    275275        Initializes the buffer.  Starts the Process data 
    276276        thread, which waits for data to be added to the buffer''' 
    277277 
    278         self.rc2007_gui_ref = rc2007_gui_ref 
     278        self.OSSIETalk_ref = OSSIETalk_ref 
    279279    
    280280        # new method:  
    … …  
    373373                #elif metadata.app_id==2: 
    374374                #    # text data 
    375                 #    self.rc2007_gui_ref.prnt_app.frame.DisplayText(data) 
     375                #    self.OSSIETalk_ref.prnt_app.frame.DisplayText(data) 
    376376                # 
    377377                #else: 
    378378                    # unknown application identifier 
    379                 #print "ERROR! rc2007_gui: unknown app_id: " + str(metadata.app_id) 
     379                #print "ERROR! OSSIETalk: unknown app_id: " + str(metadata.app_id) 
    380380 
    381381            self.data_signal.clear()  # done reading the buffer 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/configure.ac

    r5555 r8794  
    1 AC_INIT(rc2007_gui, 0.7.0) 
     1AC_INIT(OSSIETalk, 0.7.0) 
    22AM_INIT_AUTOMAKE 
    33 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/port_impl.py

    r8657 r8794  
    44Copyright 2007 Virginia Polytechnic Institute and State University 
    55 
    6 This file is part of the OSSIE USRP_Commander_GUI. 
     6This file is part of the OSSIETalk. 
    77 
    8 OSSIE USRP_Commander_GUI is free software; you can redistribute it and/or modify 
     8OSSIE OSSIETalk is free software; you can redistribute it and/or modify 
    99it under the terms of the GNU General Public License as published by 
    1010the Free Software Foundation; either version 2 of the License, or 
    1111(at your option) any later version. 
    1212 
    13 OSSIE USRP_Commander_GUI is distributed in the hope that it will be useful, 
     13OSSIE OSSIETalk is distributed in the hope that it will be useful, 
    1414but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1515MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1717 
    1818You should have received a copy of the GNU General Public License 
    19 along with OSSIE USRP_Commander_GUI; if not, write to the Free Software 
     19along with OSSIETalk; if not, write to the Free Software 
    2020Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2121 
    … …  
    3030 
    3131#------------------------------------------------------------------ 
    32 # dataIn_realChar_metadata_i class definition 
     32# dataIn_realChar_i class definition 
    3333#------------------------------------------------------------------ 
    3434# from radio 
    … …  
    3939 
    4040    def pushPacket(self, data): 
    41         #print "WARNING! rc2007_gui::pushPacket() not supported without meta data" 
    42         #self.parent.rx_work_mod.AddMetaData(data) 
    4341        self.parent.rx_work_mod.AddData(data) 
    44          
    45  
    46     #def pushPacket(self, data): 
    47         #print "rx packet " + str(metadata.packet_id) + \ 
    48         #      ", len = " + str(len(data)) + \ 
    49         #      "  app: " + str(metadata.app_id) 
    50         #self.parent.rx_work_mod.AddMetaData(data) 
     42        
    5143 
    5244 
    5345 
    5446#------------------------------------------------------------------ 
    55 # dataOut_realChar_metadata_i class definition 
     47# dataOut_realChar_i class definition 
    5648#------------------------------------------------------------------ 
    5749# to radio 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/setup.py

    r5427 r8794  
    1111sys.argv.append('--install-lib='+install_location) 
    1212 
    13 setup(name='rc2007_gui',  
    14       description='rc2007_gui', 
     13setup(name='OSSIETalk',  
     14      description='OSSIETalk', 
    1515      data_files=[ 
    16                   (install_location+'bin/rc2007_gui', 
    17                        ['rc2007_gui.py',  
     16                  (install_location+'bin/OSSIETalk', 
     17                       ['OSSIETalk.py',  
    1818                        'WorkModules.py', 
    1919                        'wx_inits.py',    
    2020                        'port_impl.py', 
    2121                        'cvsd.py']), 
    22                   (install_location+'xml/rc2007_gui', 
    23                        ['rc2007_gui.prf.xml', 
    24                         'rc2007_gui.scd.xml',  
    25                         'rc2007_gui.spd.xml']) 
     22                  (install_location+'xml/OSSIETalk', 
     23                       ['OSSIETalk.prf.xml', 
     24                        'OSSIETalk.scd.xml',  
     25                        'OSSIETalk.spd.xml']) 
    2626                 ] 
    2727     ) 

  • ossiedev/branches/hvolos/packetwfrm/components/OSSIETalk/wx_inits.py

    r8683 r8794  
    118118 
    119119    def OnStartTalk(self,event): 
    120         self.orb_ref.rc2007_gui_Obj.talk_flag = True 
     120        self.orb_ref.OSSIETalk_Obj.talk_flag = True 
    121121        event.Skip() 
    122122 
    123123  
    124124    def OnStopTalk(self,event): 
    125         self.orb_ref.rc2007_gui_Obj.talk_flag = False 
     125        self.orb_ref.OSSIETalk_Obj.talk_flag = False 
    126126        event.Skip() 
    127127 
    … …  
    131131    #    self.textEditor.Clear() 
    132132    #    if len(text)>0: 
    133     #           self.orb_ref.rc2007_gui_Obj.tx_work_mod.SendTextData(text) 
     133    #           self.orb_ref.OSSIETalk_Obj.tx_work_mod.SendTextData(text) 
    134134    #            updatedtext=str(self.rxTextEditor.GetValue()) 
    135135    #            updatedtext+='Snd('+strftime("%H:%M:%S",localtime()) + '):'+text+'\n' 
    … …  
    146146    #        self.rxTextEditor.write(updatedtext) 
    147147    #    except: 
    148     #        print "WARNING! rc2007_gui got incompatible ASCII symbols!" 
     148    #        print "WARNING! OSSIETalk got incompatible ASCII symbols!" 
    149149 
    150150    #def OnClearTextHistory(self,event):