Author: derek Date: Wed Jan 10 23:27:19 2007 New Revision: 227 Added: sofaswitch/trunk/callflow/bitmaps/SendMessage.png (contents, props changed) sofaswitch/trunk/callflow/bitmaps/sendmessage.xpm Modified: sofaswitch/trunk/callflow/src/Makefile.am sofaswitch/trunk/callflow/src/Makefile.in sofaswitch/trunk/callflow/src/callflow.cpp sofaswitch/trunk/callflow/src/callflow.h sofaswitch/trunk/callflow/src/dnd.cpp sofaswitch/trunk/callflow/src/dnd.h sofaswitch/trunk/callflow/src/drawshape.h Log: Add icon, shape and code to send a raw sofa switch message. Added: sofaswitch/trunk/callflow/bitmaps/SendMessage.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/bitmaps/sendmessage.xpm ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/bitmaps/sendmessage.xpm Wed Jan 10 23:27:19 2007 @@ -0,0 +1,23 @@ +/* XPM */ +static char * sendmessage_xpm[] = { +"16 16 4 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #808080", +" ", +" ", +" ", +" ............. ", +" .+++++++++++.@ ", +" ..+++++++++..@ ", +" .+.+++++++.+.@ ", +" .++.+++++.++.@ ", +" .++..+++..++.@ ", +" .+.++...++.+.@ ", +" ..+++++++++..@ ", +" .............@ ", +" @@@@@@@@@@@@@ ", +" ", +" ", +" "}; Modified: sofaswitch/trunk/callflow/src/Makefile.am ============================================================================== --- sofaswitch/trunk/callflow/src/Makefile.am (original) +++ sofaswitch/trunk/callflow/src/Makefile.am Wed Jan 10 23:27:19 2007 @@ -41,6 +41,7 @@ ../bitmaps/senddtmf.xpm \ ../bitmaps/stoptimer.xpm \ ../bitmaps/readfromfile.xpm \ + ../bitmaps/sendmessage.xpm \ ../bitmaps/writetofile.xpm \ ../bitmaps/transfermedia.xpm \ callflow.cpp \ @@ -85,6 +86,8 @@ requestnode.h \ senddtmf.cpp \ senddtmf.h \ + sendmessage.cpp \ + sendmessage.h \ shapelist.cpp \ shapelist.h \ shapeselect.cpp \ Modified: sofaswitch/trunk/callflow/src/Makefile.in ============================================================================== --- sofaswitch/trunk/callflow/src/Makefile.in (original) +++ sofaswitch/trunk/callflow/src/Makefile.in Wed Jan 10 23:27:19 2007 @@ -55,9 +55,10 @@ fileio.$(OBJEXT) information.$(OBJEXT) joinblocks.$(OBJEXT) \ listpoints.$(OBJEXT) loadnewgraph.$(OBJEXT) makecall.$(OBJEXT) \ python.$(OBJEXT) readfromfile.$(OBJEXT) requestnode.$(OBJEXT) \ - senddtmf.$(OBJEXT) shapelist.$(OBJEXT) shapeselect.$(OBJEXT) \ - startfor.$(OBJEXT) starthere.$(OBJEXT) stoptimer.$(OBJEXT) \ - timer.$(OBJEXT) transfermedia.$(OBJEXT) writetofile.$(OBJEXT) + senddtmf.$(OBJEXT) sendmessage.$(OBJEXT) shapelist.$(OBJEXT) \ + shapeselect.$(OBJEXT) startfor.$(OBJEXT) starthere.$(OBJEXT) \ + stoptimer.$(OBJEXT) timer.$(OBJEXT) transfermedia.$(OBJEXT) \ + writetofile.$(OBJEXT) callflow_OBJECTS = $(am_callflow_OBJECTS) am__DEPENDENCIES_1 = callflow_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -220,6 +221,7 @@ ../bitmaps/senddtmf.xpm \ ../bitmaps/stoptimer.xpm \ ../bitmaps/readfromfile.xpm \ + ../bitmaps/sendmessage.xpm \ ../bitmaps/writetofile.xpm \ ../bitmaps/transfermedia.xpm \ callflow.cpp \ @@ -264,6 +266,8 @@ requestnode.h \ senddtmf.cpp \ senddtmf.h \ + sendmessage.cpp \ + sendmessage.h \ shapelist.cpp \ shapelist.h \ shapeselect.cpp \ @@ -373,6 +377,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readfromfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/requestnode.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/senddtmf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendmessage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shapelist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shapeselect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/startfor.Po@am__quote@ Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Wed Jan 10 23:27:19 2007 @@ -50,6 +50,7 @@ #include "bitmaps/stoptimer.xpm" #include "bitmaps/transfermedia.xpm" #include "bitmaps/writetofile.xpm" +#include "bitmaps/sendmessage.xpm" class MyFrame ; @@ -70,36 +71,37 @@ #include "callflow.h" BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU ( wxH_CONTROLSCOMPILE, MyFrame::OnCompile) + EVT_MENU ( wxH_CONTROLSCOMPILE, MyFrame::OnCompile) EVT_MENU ( wxH_CONTROLSCONNECT_OBJECTS, MyFrame::OnControlsConnectObjects) - EVT_MENU ( wxH_CONTROLSDEATH, MyFrame::OnControlsDeath) - EVT_MENU ( wxH_CONTROLSENDCALL, MyFrame::OnControlsEndCall) - EVT_MENU ( wxH_CONTROLSENDHERE, MyFrame::OnControlsendhere) - EVT_MENU ( wxH_CONTROLSEND_FOR, MyFrame::OnControlsend_for) - EVT_MENU ( wxH_CONTROLSEVENTER, MyFrame::OnControlsEventer) - EVT_MENU ( wxH_CONTROLSFOR, MyFrame::OnControlsfor) - EVT_MENU ( wxH_CONTROLSIF, MyFrame::OnControlsif) - EVT_MENU ( wxH_CONTROLSLOADNEWGRAPH, MyFrame::OnControlsLoadNewGraph) - EVT_MENU ( wxH_CONTROLSMAKECALL, MyFrame::OnControlsMakeCall) - EVT_MENU ( wxH_CONTROLSPYTHON, MyFrame::OnControlspython) - EVT_MENU ( wxH_CONTROLSREQUESTNODE, MyFrame::OnControlsrequestnode) - EVT_MENU ( wxH_CONTROLSSENDDTMF, MyFrame::OnControlsSendDtmf) - EVT_MENU ( wxH_CONTROLSSTARTHERE, MyFrame::OnControlsstarthere) - EVT_MENU ( wxH_CONTROLSSTOPTIMER, MyFrame::OnControlsStopTimer) - EVT_MENU ( wxH_CONTROLSTIMER, MyFrame::OnControlsTimer) - EVT_MENU ( wxH_CONTROLSTRANSFERMEDIA, MyFrame::OnControlsTransferMedia) - EVT_MENU ( wxH_CONTROLSREADFROMFILE, MyFrame::OnControlsReadFromFile) - EVT_MENU ( wxH_CONTROLSWRITETOFILE, MyFrame::OnControlsWriteToFile) - EVT_MENU ( wxH_EDITCOPY, MyFrame::OnEditCopy) - EVT_MENU ( wxH_EDITCUT, MyFrame::OnEditCut) - EVT_MENU ( wxH_EDITPASTE, MyFrame::OnEditPaste) - EVT_MENU ( wxH_FILEE_XIT, MyFrame::OnFileE_xit) - EVT_MENU ( wxH_FILENEW, MyFrame::OnFileNew) - EVT_MENU ( wxH_FILEOPEN, MyFrame::OnFileOpen) - EVT_MENU ( wxH_FILESAVE, MyFrame::OnFileSave) - EVT_MENU ( wxH_FILESAVE__AS, MyFrame::OnFileSave__As) - EVT_MENU ( wxH_HELPABOUT, MyFrame::OnHelpAbout) - EVT_MENU ( wxH_HELPMANUAL, MyFrame::OnHelpManual) + EVT_MENU ( wxH_CONTROLSDEATH, MyFrame::OnControlsDeath) + EVT_MENU ( wxH_CONTROLSENDCALL, MyFrame::OnControlsEndCall) + EVT_MENU ( wxH_CONTROLSENDHERE, MyFrame::OnControlsendhere) + EVT_MENU ( wxH_CONTROLSEND_FOR, MyFrame::OnControlsend_for) + EVT_MENU ( wxH_CONTROLSEVENTER, MyFrame::OnControlsEventer) + EVT_MENU ( wxH_CONTROLSFOR, MyFrame::OnControlsfor) + EVT_MENU ( wxH_CONTROLSIF, MyFrame::OnControlsif) + EVT_MENU ( wxH_CONTROLSLOADNEWGRAPH, MyFrame::OnControlsLoadNewGraph) + EVT_MENU ( wxH_CONTROLSMAKECALL, MyFrame::OnControlsMakeCall) + EVT_MENU ( wxH_CONTROLSPYTHON, MyFrame::OnControlspython) + EVT_MENU ( wxH_CONTROLSSENDMESSAGE, MyFrame::OnControlsSendMessage) + EVT_MENU ( wxH_CONTROLSREQUESTNODE, MyFrame::OnControlsrequestnode) + EVT_MENU ( wxH_CONTROLSSENDDTMF, MyFrame::OnControlsSendDtmf) + EVT_MENU ( wxH_CONTROLSSTARTHERE, MyFrame::OnControlsstarthere) + EVT_MENU ( wxH_CONTROLSSTOPTIMER, MyFrame::OnControlsStopTimer) + EVT_MENU ( wxH_CONTROLSTIMER, MyFrame::OnControlsTimer) + EVT_MENU ( wxH_CONTROLSTRANSFERMEDIA, MyFrame::OnControlsTransferMedia) + EVT_MENU ( wxH_CONTROLSREADFROMFILE, MyFrame::OnControlsReadFromFile) + EVT_MENU ( wxH_CONTROLSWRITETOFILE, MyFrame::OnControlsWriteToFile) + EVT_MENU ( wxH_EDITCOPY, MyFrame::OnEditCopy) + EVT_MENU ( wxH_EDITCUT, MyFrame::OnEditCut) + EVT_MENU ( wxH_EDITPASTE, MyFrame::OnEditPaste) + EVT_MENU ( wxH_FILEE_XIT, MyFrame::OnFileE_xit) + EVT_MENU ( wxH_FILENEW, MyFrame::OnFileNew) + EVT_MENU ( wxH_FILEOPEN, MyFrame::OnFileOpen) + EVT_MENU ( wxH_FILESAVE, MyFrame::OnFileSave) + EVT_MENU ( wxH_FILESAVE__AS, MyFrame::OnFileSave__As) + EVT_MENU ( wxH_HELPABOUT, MyFrame::OnHelpAbout) + EVT_MENU ( wxH_HELPMANUAL, MyFrame::OnHelpManual) EVT_CLOSE(MyFrame::OnClose) END_EVENT_TABLE() @@ -157,6 +159,7 @@ Controls_menu -> Append ( wxH_CONTROLSLOADNEWGRAPH, wxT("load pre-existing compiled graph"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSMAKECALL, wxT("make a call"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSPYTHON, wxT("python"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSSENDMESSAGE, wxT("send sofa message"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSREADFROMFILE, wxT("read audio from file"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSREQUESTNODE, wxT("request node"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSSENDDTMF, wxT("send dtmf"), wxT("")); @@ -321,26 +324,27 @@ toolBar->AddSeparator() ; - toolBar->AddTool(wxH_CONTROLSDEATH, wxBitmap ( death ), wxT("End all processing in this flow chart")); - toolBar->AddTool(wxH_CONTROLSENDCALL, wxBitmap ( endcall ), wxT("End a call (send hangup)")); - toolBar->AddTool(wxH_CONTROLSSTARTHERE, wxBitmap ( Controlsstart ), wxT("Start processing")); - toolBar->AddTool(wxH_CONTROLSENDHERE, wxBitmap ( ControlsEndHere ), wxT("End processing")); - toolBar->AddTool(wxH_CONTROLSREQUESTNODE, wxBitmap (RequestNode ), wxT("Query Supervisor for worker node")); - toolBar->AddTool(wxH_CONTROLSSENDDTMF, wxBitmap (senddtmf), wxT("Send DTMF string to worker node")); - toolBar->AddTool(wxH_CONTROLSIF, wxBitmap ( ControlsIf_xpm ), wxT("Test a condition")); - toolBar->AddTool(wxH_CONTROLSTIMER, wxBitmap ( miniclock_xpm ), wxT("Start a timer")); - toolBar->AddTool(wxH_CONTROLSSTOPTIMER, wxBitmap ( stoptimer ), wxT("Stop specified timer")); - toolBar->AddTool(wxH_CONTROLSEVENTER, wxBitmap ( eventer_xpm ), wxT("Register for & Wait for an event")); - toolBar->AddTool(wxH_CONTROLSMAKECALL, wxBitmap (makecall), wxT("Make a voip/TDM call to outside entity")); - toolBar->AddTool(wxH_CONTROLSFOR, wxBitmap ( Controlsfor_xpm ), wxT("Start a for loop")); - toolBar->AddTool(wxH_CONTROLSEND_FOR, wxBitmap ( Controlsend_for_xpm ), wxT("end a for loop")); - toolBar->AddTool(wxH_CONTROLSPYTHON, wxBitmap ( Python_xpm ), wxT("arbitrary python code")); + toolBar->AddTool(wxH_CONTROLSDEATH, wxBitmap ( death ), wxT("End all processing in this flow chart")); + toolBar->AddTool(wxH_CONTROLSENDCALL, wxBitmap ( endcall ), wxT("End a call (send hangup)")); + toolBar->AddTool(wxH_CONTROLSSTARTHERE, wxBitmap ( Controlsstart ), wxT("Start processing")); + toolBar->AddTool(wxH_CONTROLSENDHERE, wxBitmap ( ControlsEndHere ), wxT("End processing")); + toolBar->AddTool(wxH_CONTROLSREQUESTNODE, wxBitmap (RequestNode ), wxT("Query Supervisor for worker node")); + toolBar->AddTool(wxH_CONTROLSSENDDTMF, wxBitmap (senddtmf), wxT("Send DTMF string to worker node")); + toolBar->AddTool(wxH_CONTROLSIF, wxBitmap ( ControlsIf_xpm ), wxT("Test a condition")); + toolBar->AddTool(wxH_CONTROLSTIMER, wxBitmap ( miniclock_xpm ), wxT("Start a timer")); + toolBar->AddTool(wxH_CONTROLSSTOPTIMER, wxBitmap ( stoptimer ), wxT("Stop specified timer")); + toolBar->AddTool(wxH_CONTROLSEVENTER, wxBitmap ( eventer_xpm ), wxT("Register for & Wait for an event")); + toolBar->AddTool(wxH_CONTROLSMAKECALL, wxBitmap (makecall), wxT("Make a voip/TDM call to outside entity")); + toolBar->AddTool(wxH_CONTROLSFOR, wxBitmap ( Controlsfor_xpm ), wxT("Start a for loop")); + toolBar->AddTool(wxH_CONTROLSEND_FOR, wxBitmap ( Controlsend_for_xpm ), wxT("end a for loop")); + toolBar->AddTool(wxH_CONTROLSPYTHON, wxBitmap ( Python_xpm ), wxT("arbitrary python code")); + toolBar->AddTool(wxH_CONTROLSSENDMESSAGE, wxBitmap ( sendmessage_xpm ), wxT("send arbitrary sofa message")); toolBar->AddTool(wxH_CONTROLSCONNECT_OBJECTS, wxBitmap ( JoinObjects ), wxT("Join objects with multi segmented lines")); - toolBar->AddTool(wxH_CONTROLSWRITETOFILE, wxBitmap ( writetofile ), wxT("send audio to file")); - toolBar->AddTool(wxH_CONTROLSREADFROMFILE, wxBitmap ( readfromfile ),wxT("read audio from file")); - toolBar->AddTool(wxH_CONTROLSTRANSFERMEDIA, wxBitmap ( transfermedia ), wxT("transfer media between workers")); - toolBar->AddTool(wxH_CONTROLSLOADNEWGRAPH, wxBitmap ( newgraph ), wxT("open existing graph file to handle new task")); + toolBar->AddTool(wxH_CONTROLSWRITETOFILE, wxBitmap ( writetofile ), wxT("send audio to file")); + toolBar->AddTool(wxH_CONTROLSREADFROMFILE, wxBitmap ( readfromfile ),wxT("read audio from file")); + toolBar->AddTool(wxH_CONTROLSTRANSFERMEDIA, wxBitmap ( transfermedia ), wxT("transfer media between workers")); + toolBar->AddTool(wxH_CONTROLSLOADNEWGRAPH, wxBitmap ( newgraph ), wxT("open existing graph file to handle new task")); toolBar->AddSeparator() ; toolBar->AddTool(wxH_HELPMANUAL, wxBitmap ( HelpManual_xpm ), wxT("help on using this program")); @@ -426,6 +430,12 @@ canvas->SetEditingMode(MyCanvas::PlaceOneShape); } +void MyFrame::OnControlsSendMessage (wxCommandEvent & WXUNUSED(event)) +{ + imageTypeForPlacing = DndShape::SendMessage; + canvas->SetEditingMode(MyCanvas::PlaceOneShape); +} + void MyFrame::OnControlsDeath (wxCommandEvent & WXUNUSED(event)) { imageTypeForPlacing = DndShape::Death; Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Wed Jan 10 23:27:19 2007 @@ -23,14 +23,15 @@ wxH_CONTROLSLOADNEWGRAPH, wxH_CONTROLSMAKECALL, wxH_CONTROLSPYTHON, + wxH_CONTROLSREADFROMFILE, wxH_CONTROLSREQUESTNODE, wxH_CONTROLSSENDDTMF, + wxH_CONTROLSSENDMESSAGE, wxH_CONTROLSSTARTHERE, wxH_CONTROLSSTOPTIMER, wxH_CONTROLSTIMER, - wxH_CONTROLSWRITETOFILE, - wxH_CONTROLSREADFROMFILE, wxH_CONTROLSTRANSFERMEDIA, + wxH_CONTROLSWRITETOFILE, wxH_EDITCOPY, wxH_EDITCUT, wxH_EDITPASTE, @@ -150,6 +151,11 @@ python code for processing. One such use is print statements.*/ void OnControlspython (wxCommandEvent & event); + /**Called in response to a user comand to add a "SendMessage" widget to + the current graph. This widget allows the user to send a sofa message + to any other sofa entity */ + void OnControlsSendMessage (wxCommandEvent & event); + /**Called in response to a user comand to add a "Stop Timer" widget to the current graph. This is used when an event has been detected before a timer has timed out, so the timer needs to be stopped. */ Modified: sofaswitch/trunk/callflow/src/dnd.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.cpp (original) +++ sofaswitch/trunk/callflow/src/dnd.cpp Wed Jan 10 23:27:19 2007 @@ -447,6 +447,9 @@ if (thisKind == LoadNewGraph) return DndShapeLoadNewGraph::GetKindName(); + if (thisKind == SendMessage) + return DndShapeSendMessage::GetKindName(); + wxString answer = wxString::Format("node kind is %d", thisKind); return answer; } @@ -551,6 +554,7 @@ case Timer: return new DndShapeTimer(); case TransferMedia: return new DndShapeTransferMedia(); case WriteToFile: return new DndShapeWriteToFile(); + case SendMessage: return new DndShapeSendMessage(); default: printf("Unknown construction of shape %d\n", shapeRequired); } Modified: sofaswitch/trunk/callflow/src/dnd.h ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.h (original) +++ sofaswitch/trunk/callflow/src/dnd.h Wed Jan 10 23:27:19 2007 @@ -282,7 +282,8 @@ LoadNewGraph = 18, /*!< Read in an existing graph file (pre compiled) for a new thread of exeuction */ SendDtmf = 19, /*!< Send a dtmf symbol to some sofaswitch worker node */ Death = 20, /*!< End all processing of this call flow now */ - KnownShapes = 21 /*!< Indicates the number of known shapes we can manage */ + SendMessage = 21, /*!< Send some message to some remote sofa entity */ + KnownShapes = 21, /*!< Indicates the number of known shapes we can manage */ }; /**Constructor to a predefined shape */ Modified: sofaswitch/trunk/callflow/src/drawshape.h ============================================================================== --- sofaswitch/trunk/callflow/src/drawshape.h (original) +++ sofaswitch/trunk/callflow/src/drawshape.h Wed Jan 10 23:27:19 2007 @@ -14,6 +14,7 @@ #include "readfromfile.h" #include "requestnode.h" #include "senddtmf.h" +#include "sendmessage.h" #include "shapeselect.h" #include "startfor.h" #include "starthere.h"