- sofaswitch-svn@lists.freeswitch.org - FreeSWITCH Mailing Lists

[Sofaswitch-svn] [commit] r122 - in sofaswitch/trunk/callflow: bitmaps src
by SofaSWITCH SVN 25 Sep '06

25 Sep '06

Author: derek Date: Mon Sep 25 00:25:02 2006 New Revision: 122 Modified: sofaswitch/trunk/callflow/bitmaps/makecall.xpm sofaswitch/trunk/callflow/src/callflow.cpp sofaswitch/trunk/callflow/src/callflow.h sofaswitch/trunk/callflow/src/dnd.cpp sofaswitch/trunk/callflow/src/loadnewgraph.cpp sofaswitch/trunk/callflow/src/makecall.cpp Log: Add notion of calling a remote node. Modified: sofaswitch/trunk/callflow/bitmaps/makecall.xpm ============================================================================== --- sofaswitch/trunk/callflow/bitmaps/makecall.xpm (original) +++ sofaswitch/trunk/callflow/bitmaps/makecall.xpm Mon Sep 25 00:25:02 2006 @@ -1,11 +1,12 @@ /* XPM */ static char *makecall[]={ -"32 32 5 1", +"32 32 6 1", ". c None", "# c #000000", +"b c #00c0c0", "a c #585858", -"b c #c00000", -"c c #ff0000", +"c c #c00000", +"d c #ff0000", "................................", "................###.............", "..............##a.a##...........", @@ -14,25 +15,25 @@ ".......###.a.aa.a.a.a.a..##.....", ".....##..a..a..####..a.aa.a##...", "...##.aaa.a.###....##a.a.aa.a##.", -"###.aa.a####.........##a.a.aaa.#", -".###.###...............##.a.a..#", -"....#....................##..a#.", -".......##a#..aaaa..aaaa....###..", -".......##a#..###a..###a.........", -".......##a#..##a#..#aaa.........", +"###.aa.a####bb.......##a.a.aaa.#", +".###.###bbbb.........bb##.a.a..#", +"....#bbbb.............bbb##..a#.", +"...bbb.##a#..aaaa..aaaa.bbb###..", +"..bbb..##a#..###a..###a...bbb...", +".......##a#..##a#..#aaa....bb...", ".......##a#..#a##..###a.........", ".......##a#..aaaa..aaaa.........", "................................", "................................", ".......a###..aaaa..a###.........", ".......a###..a###..a###.........", -".......a#a#..aaaa..aaaabbb......", -".......aaaa..###a..a##accccc....", -".......##a#..aaaa..aaaabbbbbbcc.", -"cccccccccccccccccccccccccccccccc", -".......................bbbbbbcc.", -".......aaaa..aaaa..aaaaccccc....", -".......###a..a##a..a##abbb......", +".......a#a#..aaaa..aaaaccc......", +".......aaaa..###a..a##addddd....", +".......##a#..aaaa..aaaaccccccdd.", +"dddddddddddddddddddddddddddddddd", +".......................ccccccdd.", +".......aaaa..aaaa..aaaaddddd....", +".......###a..a##a..a##accc......", ".......##a#..aaaa..aaaa.........", ".......##a#..a##a..##aa.........", ".......#a##..aaaa..##a#.........", Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Mon Sep 25 00:25:02 2006 @@ -36,6 +36,7 @@ #include "bitmaps/FileSave.xpm" #include "bitmaps/FileSave__As.xpm" #include "bitmaps/JoinObjects.xpm" +#include "bitmaps/makecall.xpm" #include "bitmaps/Python.xpm" #include "bitmaps/RequestNode.xpm" #include "bitmaps/compile.xpm" @@ -64,31 +65,32 @@ #include "callflow.h" BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU ( wxH_EDITPASTE, MyFrame::OnEditPaste) - EVT_MENU ( wxH_EDITCOPY, MyFrame::OnEditCopy) - EVT_MENU ( wxH_EDITCUT, MyFrame::OnEditCut) - EVT_MENU ( wxH_HELPABOUT, MyFrame::OnHelpAbout) - EVT_MENU ( wxH_HELPMANUAL, MyFrame::OnHelpManual) - EVT_MENU ( wxH_CONTROLSREQUESTNODE, MyFrame::OnControlsrequestnode) - EVT_MENU ( wxH_CONTROLSPYTHON, MyFrame::OnControlspython) + EVT_MENU ( wxH_CONTROLSCOMPILE, MyFrame::OnCompile) + EVT_MENU ( wxH_CONTROLSCONNECT_OBJECTS, MyFrame::OnControlsConnectObjects) + EVT_MENU ( wxH_CONTROLSEND, MyFrame::OnControlsend) + 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_CONTROLSTIMER, MyFrame::OnControlsTimer) - EVT_MENU ( wxH_CONTROLSSTOPTIMER, MyFrame::OnControlsStopTimer) - EVT_MENU ( wxH_CONTROLSEVENTER, MyFrame::OnControlsEventer) - EVT_MENU ( wxH_CONTROLSEND, MyFrame::OnControlsend) + 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_CONTROLSSTARTHERE, MyFrame::OnControlsstarthere) - EVT_MENU ( wxH_CONTROLSENDHERE, MyFrame::OnControlsendhere) - EVT_MENU ( wxH_CONTROLSCONNECT_OBJECTS, MyFrame::OnControlsConnectObjects) - EVT_MENU ( wxH_CONTROLSCOMPILE, MyFrame::OnCompile) + EVT_MENU ( wxH_CONTROLSSTOPTIMER, MyFrame::OnControlsStopTimer) + EVT_MENU ( wxH_CONTROLSTIMER, MyFrame::OnControlsTimer) EVT_MENU ( wxH_CONTROLSTRANSFERMEDIA, MyFrame::OnControlsTransferMedia) - EVT_MENU ( wxH_CONTROLSLOADNEWGRAPH, MyFrame::OnControlsLoadNewGraph) + 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_FILESAVE__AS, MyFrame::OnFileSave__As) - EVT_MENU ( wxH_FILESAVE, MyFrame::OnFileSave) - EVT_MENU ( wxH_FILEOPEN, MyFrame::OnFileOpen) 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() @@ -135,20 +137,21 @@ File_menu -> Append ( wxH_FILESAVE, wxT("&Save"), wxT("")); File_menu -> Append ( wxH_FILESAVE__AS, wxT("Save &As"), wxT("")); File_menu -> Append ( wxH_FILEE_XIT, wxT("E&xit"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSSTARTHERE, wxT("start here"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSENDHERE, wxT("end here"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSREQUESTNODE, wxT("request node"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSCONNECT_OBJECTS, wxT("connect objects"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSEND, wxT("end"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSIF, wxT("if"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSTIMER, wxT("timer"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSSTOPTIMER, wxT("stop running timer"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSENDHERE, wxT("end here"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSEND_FOR, wxT("end for"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSEVENTER, wxT("event reg/wait"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSFOR, wxT("for"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSEND_FOR, wxT("end for"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSIF, wxT("if"), wxT("")); + 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_CONTROLSCONNECT_OBJECTS, wxT("connect objects"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSREQUESTNODE, wxT("request node"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSSTARTHERE, wxT("start here"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSSTOPTIMER, wxT("stop running timer"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSTIMER, wxT("timer"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSTRANSFERMEDIA, wxT("transfer media between entities"), wxT("")); - Controls_menu -> Append ( wxH_CONTROLSLOADNEWGRAPH, wxT("load pre-existing compiled graph"), wxT("")); Help_menu -> Append ( wxH_HELPMANUAL, wxT("Manual"), wxT("")); Help_menu -> AppendSeparator () ; Help_menu -> Append ( wxH_HELPABOUT, wxT("About"), wxT("")); @@ -303,7 +306,7 @@ 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")); @@ -399,6 +402,12 @@ void MyFrame::OnControlsLoadNewGraph (wxCommandEvent & WXUNUSED(event)) { imageTypeForPlacing = DndShape::LoadNewGraph; + canvas->SetEditingMode(MyCanvas::PlaceOneShape); + +} +void MyFrame::OnControlsMakeCall (wxCommandEvent & WXUNUSED(event)) +{ + imageTypeForPlacing = DndShape::MakeCall, canvas->SetEditingMode(MyCanvas::PlaceOneShape); } Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Mon Sep 25 00:25:02 2006 @@ -11,31 +11,32 @@ { // menu IDs these two are needed by wxHatch wxH_FILE = 1, - wxH_FILENEW, - wxH_FILEOPEN, - wxH_FILESAVE, - wxH_FILESAVE__AS, - wxH_FILEE_XIT, - wxH_CONTROLSSTARTHERE, - wxH_CONTROLSENDHERE, - wxH_CONTROLSREQUESTNODE, + wxH_CONTROLSCOMPILE, + wxH_CONTROLSCONNECT_OBJECTS, wxH_CONTROLSEND, - wxH_CONTROLSIF, - wxH_CONTROLSTIMER, - wxH_CONTROLSSTOPTIMER, + wxH_CONTROLSENDHERE, + wxH_CONTROLSEND_FOR, wxH_CONTROLSEVENTER, wxH_CONTROLSFOR, - wxH_CONTROLSEND_FOR, + wxH_CONTROLSIF, + wxH_CONTROLSLOADNEWGRAPH, + wxH_CONTROLSMAKECALL, wxH_CONTROLSPYTHON, - wxH_CONTROLSCONNECT_OBJECTS, - wxH_CONTROLSCOMPILE, + wxH_CONTROLSREQUESTNODE, + wxH_CONTROLSSTARTHERE, + wxH_CONTROLSSTOPTIMER, + wxH_CONTROLSTIMER, wxH_CONTROLSTRANSFERMEDIA, - wxH_CONTROLSLOADNEWGRAPH, - wxH_HELPMANUAL, - wxH_HELPABOUT, - wxH_EDITCUT, wxH_EDITCOPY, + wxH_EDITCUT, wxH_EDITPASTE, + wxH_FILEE_XIT, + wxH_FILENEW, + wxH_FILEOPEN, + wxH_FILESAVE, + wxH_FILESAVE__AS, + wxH_HELPABOUT, + wxH_HELPMANUAL, wxH_QUIT }; @@ -147,6 +148,12 @@ once. This is used to handle, say, incoming calls, or to make an outgong call. */ void OnControlsLoadNewGraph(wxCommandEvent & event); + + /**Called in response to a user comand to add a "Make Call" widget to the + current graph. The make call causes the running python code to grab a + current sofaswitch worker (say a voip or TDM circuit) to call outside + the building */ + void OnControlsMakeCall(wxCommandEvent & event); /**Called in response to a user comand to add a "Draw Line Segment" widget to the current graph. The multiple line segment object is used to join Modified: sofaswitch/trunk/callflow/src/dnd.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.cpp (original) +++ sofaswitch/trunk/callflow/src/dnd.cpp Mon Sep 25 00:25:02 2006 @@ -489,20 +489,22 @@ case None: printf("Construct a shape of null\n"); return NULL; - case StartHere: return new DndShapeStartHere(); - case EndHere: return new DndShapeEndHere(); - case StartFor: return new DndShapeStartFor(); - case EndFor: return new DndShapeEndFor(); - case Conditional: return new DndShapeConditional(); - case MakeCall: return new DndShapeMakeCall(); - case EndCall: return new DndShapeEndCall(); - case Select: return new DndShapeSelect(); - case JoinBlocks: return new DndShapeJoinBlocks(); - case Python: return new DndShapePython(); - case RequestNode: return new DndShapeRequestNode(); - case Timer: return new DndShapeTimer(); - case StopTimer: return new DndShapeStopTimer(); - case Eventer: return new DndShapeEventer(); + case Conditional: return new DndShapeConditional(); + case EndCall: return new DndShapeEndCall(); + case EndFor: return new DndShapeEndFor(); + case EndHere: return new DndShapeEndHere(); + case Eventer: return new DndShapeEventer(); + case JoinBlocks: return new DndShapeJoinBlocks(); + case LoadNewGraph: return new DndShapeLoadNewGraph(); + case MakeCall: return new DndShapeMakeCall(); + case Python: return new DndShapePython(); + case RequestNode: return new DndShapeRequestNode(); + case Select: return new DndShapeSelect(); + case StartFor: return new DndShapeStartFor(); + case StartHere: return new DndShapeStartHere(); + case StopTimer: return new DndShapeStopTimer(); + case Timer: return new DndShapeTimer(); + case TransferMedia: return new DndShapeTransferMedia(); default: printf("Unknown construction of shape %d\n", shapeRequired); } Modified: sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/loadnewgraph.cpp (original) +++ sofaswitch/trunk/callflow/src/loadnewgraph.cpp Mon Sep 25 00:25:02 2006 @@ -44,20 +44,22 @@ DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); - dc.DrawLine(pC, pB); +// dc.DrawLine(pC, pB); - wxPoint polygon[20]; - for (int i = 0; i < 20; i++) { - int radius = (i % 2) == 0 ? 9 : 4; + for (int i = 0; i < 10; i++) { + int r1 = 25; + int r2 = 5; double theta = (270 + (36 * i)) * M_PI * 2.0/360.0; - int xx = 3 + (int)(radius * cos(theta)); - int yy = 39 + (int)(radius * sin(theta)); - polygon[i] = wxPoint(xx, yy); + wxPoint p1(m_rect.x + 25 + (int)(r1 * cos(theta)), + m_rect.y + 25 + (int)(r1 * sin(theta))); + wxPoint p2(m_rect.x + 25 + (int)(r2 * cos(theta)), + m_rect.y + 25 + (int)(r2 * sin(theta))); + dc.DrawLine(p1, p2); } - dc.DrawPolygon(10, polygon, m_rect.x, m_rect.y); - - DrawBox(dc, 15, 15, 30, 30); - + + DrawBox(dc, 20, 20, 10, 10); + + dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); DndShape::Draw(dc); } Modified: sofaswitch/trunk/callflow/src/makecall.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/makecall.cpp (original) +++ sofaswitch/trunk/callflow/src/makecall.cpp Mon Sep 25 00:25:02 2006 @@ -25,6 +25,13 @@ relInputPoints.Add(25, 0); relOutputPoints.Add(25, 50); + + displayData[displayData.size()] = + InformationSection(wxT("Worker node to activate (python code)"), wxT("\"voip1\"")); + + displayData[displayData.size()] = + InformationSection(wxT("Call destination (python code)"), wxT("\"h323.voxgratia.org\"")); + AdjustIoPoints(); } @@ -42,16 +49,15 @@ void DndShapeMakeCall::Draw(wxDC& dc) { DrawCompileError(dc); - dc.SetPen(*wxBLACK_PEN); + dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); wxPoint p1(m_rect.GetPosition()); wxPoint pA(p1.x + 25, p1.y); - wxPoint pB(p1.x + 25, p1.y + 15); + wxPoint pB(p1.x + 25, p1.y + 10); - wxPoint pY(p1.x + 25, p1.y + 35); + wxPoint pY(p1.x + 25, p1.y + 40); wxPoint pZ(p1.x + 25, p1.y + 50); - DrawBox(dc, 0, 15, 50, 20); dc.DrawLine(pA, pB); if (InputPointConnected(0)) DrawArrow(dc, pB, ArrowDown, Connected); @@ -64,6 +70,18 @@ else DrawArrow(dc, pZ, ArrowDown, Loose); + wxFont f = wxFont(*wxITALIC_FONT); + f.SetPointSize(7); + dc.SetFont(f); + for (int i = 0; i < 9; i++){ + wxString text = wxString::Format("%d", i+1); + wxCoord w, h; + dc.GetTextExtent(text, &w, &h); + int xPos = m_rect.x + 17 + ((i%3)*9) - (w/2); + int yPos = m_rect.y + 18 + ((i/3)*9) - (h/2); + dc.DrawText(text, xPos, yPos); + } + DndShape::Draw(dc); // Draw the selected overlay if required. }

1 0

[Sofaswitch-svn] [commit] r121 - sofaswitch/trunk/callflow/bitmaps
by SofaSWITCH SVN 25 Sep '06

25 Sep '06

Author: derek Date: Sun Sep 24 23:48:43 2006 New Revision: 121 Added: sofaswitch/trunk/callflow/bitmaps/makecall.xpm Log: Add this file, to make a call. Added: sofaswitch/trunk/callflow/bitmaps/makecall.xpm ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/bitmaps/makecall.xpm Sun Sep 24 23:48:43 2006 @@ -0,0 +1,40 @@ +/* XPM */ +static char *makecall[]={ +"32 32 5 1", +". c None", +"# c #000000", +"a c #585858", +"b c #c00000", +"c c #ff0000", +"................................", +"................###.............", +"..............##a.a##...........", +"............##a..a.a.##.........", +"..........##a..a.a..aa.##.......", +".......###.a.aa.a.a.a.a..##.....", +".....##..a..a..####..a.aa.a##...", +"...##.aaa.a.###....##a.a.aa.a##.", +"###.aa.a####.........##a.a.aaa.#", +".###.###...............##.a.a..#", +"....#....................##..a#.", +".......##a#..aaaa..aaaa....###..", +".......##a#..###a..###a.........", +".......##a#..##a#..#aaa.........", +".......##a#..#a##..###a.........", +".......##a#..aaaa..aaaa.........", +"................................", +"................................", +".......a###..aaaa..a###.........", +".......a###..a###..a###.........", +".......a#a#..aaaa..aaaabbb......", +".......aaaa..###a..a##accccc....", +".......##a#..aaaa..aaaabbbbbbcc.", +"cccccccccccccccccccccccccccccccc", +".......................bbbbbbcc.", +".......aaaa..aaaa..aaaaccccc....", +".......###a..a##a..a##abbb......", +".......##a#..aaaa..aaaa.........", +".......##a#..a##a..##aa.........", +".......#a##..aaaa..##a#.........", +"................................", +"................................"};

1 0

[Sofaswitch-svn] [commit] r120 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 25 Sep '06

25 Sep '06

Author: derek Date: Sun Sep 24 21:44:15 2006 New Revision: 120 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/drawshape.h sofaswitch/trunk/callflow/src/loadnewgraph.cpp sofaswitch/trunk/callflow/src/loadnewgraph.h sofaswitch/trunk/callflow/src/transfermedia.cpp sofaswitch/trunk/callflow/src/transfermedia.h Log: Get it to compile, with the new shapes etc. Modified: sofaswitch/trunk/callflow/src/Makefile.am ============================================================================== --- sofaswitch/trunk/callflow/src/Makefile.am (original) +++ sofaswitch/trunk/callflow/src/Makefile.am Sun Sep 24 21:44:15 2006 @@ -19,6 +19,7 @@ information.cpp \ joinblocks.cpp \ listpoints.cpp \ + loadnewgraph.cpp \ makecall.cpp \ python.cpp \ requestnode.cpp \ @@ -27,7 +28,8 @@ startfor.cpp \ starthere.cpp \ stoptimer.cpp \ - timer.cpp + timer.cpp \ + transfermedia.cpp Modified: sofaswitch/trunk/callflow/src/Makefile.in ============================================================================== --- sofaswitch/trunk/callflow/src/Makefile.in (original) +++ sofaswitch/trunk/callflow/src/Makefile.in Sun Sep 24 21:44:15 2006 @@ -52,10 +52,10 @@ conditional.$(OBJEXT) dnd.$(OBJEXT) drawshape.$(OBJEXT) \ endcall.$(OBJEXT) endfor.$(OBJEXT) endhere.$(OBJEXT) \ eventer.$(OBJEXT) information.$(OBJEXT) joinblocks.$(OBJEXT) \ - listpoints.$(OBJEXT) makecall.$(OBJEXT) python.$(OBJEXT) \ - requestnode.$(OBJEXT) shapelist.$(OBJEXT) \ + listpoints.$(OBJEXT) loadnewgraph.$(OBJEXT) makecall.$(OBJEXT) \ + python.$(OBJEXT) requestnode.$(OBJEXT) shapelist.$(OBJEXT) \ shapeselect.$(OBJEXT) startfor.$(OBJEXT) starthere.$(OBJEXT) \ - stoptimer.$(OBJEXT) timer.$(OBJEXT) + stoptimer.$(OBJEXT) timer.$(OBJEXT) transfermedia.$(OBJEXT) callflow_OBJECTS = $(am_callflow_OBJECTS) am__DEPENDENCIES_1 = callflow_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -188,6 +188,7 @@ information.cpp \ joinblocks.cpp \ listpoints.cpp \ + loadnewgraph.cpp \ makecall.cpp \ python.cpp \ requestnode.cpp \ @@ -196,7 +197,8 @@ startfor.cpp \ starthere.cpp \ stoptimer.cpp \ - timer.cpp + timer.cpp \ + transfermedia.cpp all: all-am @@ -281,6 +283,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/information.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/joinblocks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listpoints.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadnewgraph.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makecall.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/python.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/requestnode.Po@am__quote@ @@ -290,6 +293,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/starthere.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stoptimer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transfermedia.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Sun Sep 24 21:44:15 2006 @@ -82,6 +82,8 @@ EVT_MENU ( wxH_CONTROLSENDHERE, MyFrame::OnControlsendhere) EVT_MENU ( wxH_CONTROLSCONNECT_OBJECTS, MyFrame::OnControlsConnectObjects) EVT_MENU ( wxH_CONTROLSCOMPILE, MyFrame::OnCompile) + EVT_MENU ( wxH_CONTROLSTRANSFERMEDIA, MyFrame::OnControlsTransferMedia) + EVT_MENU ( wxH_CONTROLSLOADNEWGRAPH, MyFrame::OnControlsLoadNewGraph) EVT_MENU ( wxH_FILEE_XIT, MyFrame::OnFileE_xit) EVT_MENU ( wxH_FILESAVE__AS, MyFrame::OnFileSave__As) EVT_MENU ( wxH_FILESAVE, MyFrame::OnFileSave) @@ -145,6 +147,8 @@ Controls_menu -> Append ( wxH_CONTROLSEND_FOR, wxT("end for"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSPYTHON, wxT("python"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSCONNECT_OBJECTS, wxT("connect objects"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSTRANSFERMEDIA, wxT("transfer media between entities"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSLOADNEWGRAPH, wxT("load pre-existing compiled graph"), wxT("")); Help_menu -> Append ( wxH_HELPMANUAL, wxT("Manual"), wxT("")); Help_menu -> AppendSeparator () ; Help_menu -> Append ( wxH_HELPABOUT, wxT("About"), wxT("")); @@ -306,7 +310,7 @@ toolBar->AddTool(wxH_CONTROLSCONNECT_OBJECTS, wxBitmap ( JoinObjects ), wxT("Join objects with multi segmented lines")); toolBar->AddTool(wxH_CONTROLSTRANSFERMEDIA, wxBitmap ( transfermedia ), wxT("transfer media between workers")); - toolBar->AddTool(wxH_CONTROLSNEWGRAPH, wxBitmap ( newgraph ), wxT("open existing graph file to handle new task")); + 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")); Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Sun Sep 24 21:44:15 2006 @@ -29,8 +29,8 @@ wxH_CONTROLSPYTHON, wxH_CONTROLSCONNECT_OBJECTS, wxH_CONTROLSCOMPILE, - wxH_CONTROLSTRANFERMEDIA, - wxH_CONTROLSNEWGRAPH, + wxH_CONTROLSTRANSFERMEDIA, + wxH_CONTROLSLOADNEWGRAPH, wxH_HELPMANUAL, wxH_HELPABOUT, wxH_EDITCUT, @@ -139,7 +139,7 @@ /**Called in response to a user comand to add a "transfer media from one sofaswitch worker to another" widget to the current graph. This is used, at call setup, to connect a voip node with a sound device.. */ - void OnControlsTransferz,edia(wxCommandEvent & event); + void OnControlsTransferMedia(wxCommandEvent & event); /**Called in response to a user comand to add a "Load a New Graph" widget to the current graph. The load new graph causes a new separate stream Modified: sofaswitch/trunk/callflow/src/drawshape.h ============================================================================== --- sofaswitch/trunk/callflow/src/drawshape.h (original) +++ sofaswitch/trunk/callflow/src/drawshape.h Sun Sep 24 21:44:15 2006 @@ -7,6 +7,7 @@ #include "endhere.h" #include "eventer.h" #include "joinblocks.h" +#include "loadnewgraph.h" #include "makecall.h" #include "python.h" #include "requestnode.h" @@ -14,7 +15,7 @@ #include "startfor.h" #include "starthere.h" #include "timer.h" - +#include "transfermedia.h" #endif Modified: sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/loadnewgraph.cpp (original) +++ sofaswitch/trunk/callflow/src/loadnewgraph.cpp Sun Sep 24 21:44:15 2006 @@ -13,12 +13,12 @@ #include "shapelist.h" -#include "python.h" +#include "loadnewgraph.h" ///////////////////////////////////////////////////////////////////////////// -DndShapePython::DndShapePython() - : DndShape(Python) +DndShapeLoadNewGraph::DndShapeLoadNewGraph() + : DndShape(LoadNewGraph) { wxSize newSize(50, 50); SetSize(newSize); @@ -27,12 +27,12 @@ relOutputPoints.Add(25, 50); displayData[displayData.size()] = - InformationSection(wxT("Python Code"), wxT("self.i = 0")); + InformationSection(wxT("new graph file"), wxT("some_file")); AdjustIoPoints(); } -void DndShapePython::Draw(wxDC& dc) +void DndShapeLoadNewGraph::Draw(wxDC& dc) { DrawCompileError(dc); dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); @@ -46,42 +46,33 @@ DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); dc.DrawLine(pC, pB); - DrawBox(dc, 0, 10, 21, 21); - DrawBox(dc, 29, 10, 21, 21); - - wxString text("Pyt"); - dc.SetFont(*wxITALIC_FONT); - wxCoord w, h; - dc.GetTextExtent(text, &w, &h); - int xPos = m_rect.x + 0 + ((21 - w)/2); - int yPos = m_rect.y + 10 + ((21 - h)/2); - dc.DrawText(text, xPos, yPos); - - text = "hon"; - dc.GetTextExtent(text, &w, &h); - xPos = m_rect.x + 29 + ((21 - w)/2); - yPos = m_rect.y + 10 + ((21 - h)/2); - dc.DrawText(text, xPos, yPos); - + wxPoint polygon[20]; + for (int i = 0; i < 20; i++) { + int radius = (i % 2) == 0 ? 9 : 4; + double theta = (270 + (36 * i)) * M_PI * 2.0/360.0; + int xx = 3 + (int)(radius * cos(theta)); + int yy = 39 + (int)(radius * sin(theta)); + polygon[i] = wxPoint(xx, yy); + } + dc.DrawPolygon(10, polygon, m_rect.x, m_rect.y); - DrawBox(dc, 0, 35, 13, 13); - DrawBox(dc, 37, 35, 13, 13); + DrawBox(dc, 15, 15, 30, 30); DndShape::Draw(dc); } -bool DndShapePython::WriteSystemCode(wxTextFile & file) +bool DndShapeLoadNewGraph::WriteSystemCode(wxTextFile & file) { - file.AddLine(" def Python(self, sTuple): "); + file.AddLine(" def LoadNewGraph(self, sTuple): "); file.AddLine(" a,b,c = sTuple"); - file.AddLine(" exec(self.data[a][\"Python Code\"])"); + file.AddLine(" exec(self.data[a][\"LoadNewGraph Code\"])"); file.AddLine(" return self.data[a][\"Output\"]"); file.AddLine(""); return true; } -bool DndShapePython::WriteThisShapeInfo(wxTextFile & file) +bool DndShapeLoadNewGraph::WriteThisShapeInfo(wxTextFile & file) { file.AddLine(wxString::Format(" \"%s\" : { ", GetKey().c_str())); @@ -95,10 +86,25 @@ file.AddLine(wxString::Format(" \"Output\" : ")); file.AddLine(wxString::Format(" %s, ", outputLabel.c_str())); - file.AddLine(wxString::Format(" \"Python Code\" : ")); + file.AddLine(wxString::Format(" \"new graph file\" : ")); file.AddLine(wxString::Format(" \"%s\", ", displayData[1].data.c_str())); file.AddLine(wxString::Format(" },")); return true; +} + +bool DndShapeLoadNewGraph::TestInternalVariables() +{ + DndShape::TestInternalVariables(); + + bool firstEmpty = displayData[1].data.IsEmpty(); + + if (firstEmpty) { + SetCompileError(wxT("You must supply a file name to be processed, from which a new stream of execution happens ")); + return false; + } + + + return true; } Modified: sofaswitch/trunk/callflow/src/loadnewgraph.h ============================================================================== --- sofaswitch/trunk/callflow/src/loadnewgraph.h (original) +++ sofaswitch/trunk/callflow/src/loadnewgraph.h Sun Sep 24 21:44:15 2006 @@ -1,20 +1,21 @@ -#ifndef SHAPE_PYTHON_H +#ifndef SHAPE_LOADNEWGRAPH_H -#define SHAPE_PYTHON_H +#define SHAPE_LOADNEWGRAPH_H #include "dnd.h" ////////////////////////////////////////////////////////////////////////// -/**Define a shape to indicate an arbitrary block of python code. +/**Define a shape to indicate that we need to read in a block of compiled graph +code, and execute this graph code in a a new stream of execution. */ -class DndShapePython : public DndShape +class DndShapeLoadNewGraph : public DndShape { public: /**Construtor, Define this shape in terms of size and points etc */ - DndShapePython(); + DndShapeLoadNewGraph(); /**Destroy this shape, and log it */ - virtual ~DndShapePython() + virtual ~DndShapeLoadNewGraph() { } @@ -22,13 +23,17 @@ virtual void Draw(wxDC& dc); /** Used to report the name of this particular class. */ - static wxString GetKindName() { return wxString("Python"); } + static wxString GetKindName() { return wxString("Load New Graph");} /**Write the code generic to this Python code shape */ virtual bool WriteSystemCode(wxTextFile & file); /**Write the dictionary containing relevant points for this shape */ virtual bool WriteThisShapeInfo(wxTextFile & file); + + /**Make cerrtain that the intenal variables have been set correctly, so + this shape will compile into good code */ + virtual bool TestInternalVariables(); }; Modified: sofaswitch/trunk/callflow/src/transfermedia.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/transfermedia.cpp (original) +++ sofaswitch/trunk/callflow/src/transfermedia.cpp Sun Sep 24 21:44:15 2006 @@ -13,12 +13,12 @@ #include "shapelist.h" -#include "python.h" +#include "transfermedia.h" ///////////////////////////////////////////////////////////////////////////// -DndShapePython::DndShapePython() - : DndShape(Python) +DndShapeTransferMedia::DndShapeTransferMedia() + : DndShape(TransferMedia) { wxSize newSize(50, 50); SetSize(newSize); @@ -27,61 +27,57 @@ relOutputPoints.Add(25, 50); displayData[displayData.size()] = - InformationSection(wxT("Python Code"), wxT("self.i = 0")); + InformationSection(wxT("First SofaSwitch worker (python)"), wxT("voip1")); + displayData[displayData.size()] = + InformationSection(wxT("Second SofaSwitch worker (python)"), wxT("am1")); + AdjustIoPoints(); } -void DndShapePython::Draw(wxDC& dc) +void DndShapeTransferMedia::Draw(wxDC& dc) { DrawCompileError(dc); dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); - - wxPoint p1(m_rect.GetPosition()); - wxPoint pA(p1.x + 25, p1.y + 15); - wxPoint pB(p1.x + 25, p1.y + 0); - wxPoint pC(p1.x + 25, p1.y + 50); + wxPoint p1(m_rect.GetPosition()); + wxPoint pA(p1.x + 25, p1.y + 0); + wxPoint pB(p1.x + 25, p1.y + 50); + dc.DrawLine(pA, pB); - DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); - DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); - dc.DrawLine(pC, pB); - DrawBox(dc, 0, 10, 21, 21); - DrawBox(dc, 29, 10, 21, 21); + wxPoint tr(p1.x+40, p1.y + 15); + wxPoint br(p1.x+40, p1.y + 35); + wxPoint tl(p1.x+10, p1.y + 15); + wxPoint bl(p1.x+10, p1.y + 35); + dc.DrawLine(tl, tr); + dc.DrawLine(bl, br); + DrawArrow(dc, tl, ArrowLeft, Loose); + DrawArrow(dc, tr, ArrowRight, Loose); + DrawArrow(dc, bl, ArrowLeft, Loose); + DrawArrow(dc, br, ArrowRight, Loose); - wxString text("Pyt"); - dc.SetFont(*wxITALIC_FONT); - wxCoord w, h; - dc.GetTextExtent(text, &w, &h); - int xPos = m_rect.x + 0 + ((21 - w)/2); - int yPos = m_rect.y + 10 + ((21 - h)/2); - dc.DrawText(text, xPos, yPos); + DrawBox(dc, 0, 10, 10, 40); + DrawBox(dc, 40,10, 10, 40); - text = "hon"; - dc.GetTextExtent(text, &w, &h); - xPos = m_rect.x + 29 + ((21 - w)/2); - yPos = m_rect.y + 10 + ((21 - h)/2); - dc.DrawText(text, xPos, yPos); + DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); + DrawArrow(dc, pB, ArrowDown, OutputPointConnected(0) ? Connected : Loose); - DrawBox(dc, 0, 35, 13, 13); - DrawBox(dc, 37, 35, 13, 13); - DndShape::Draw(dc); } -bool DndShapePython::WriteSystemCode(wxTextFile & file) +bool DndShapeTransferMedia::WriteSystemCode(wxTextFile & file) { - file.AddLine(" def Python(self, sTuple): "); + file.AddLine(" def TransferMedia(self, sTuple): "); file.AddLine(" a,b,c = sTuple"); - file.AddLine(" exec(self.data[a][\"Python Code\"])"); + file.AddLine(" exec(self.data[a][\"TransferMedia Code\"])"); file.AddLine(" return self.data[a][\"Output\"]"); file.AddLine(""); return true; } -bool DndShapePython::WriteThisShapeInfo(wxTextFile & file) +bool DndShapeTransferMedia::WriteThisShapeInfo(wxTextFile & file) { file.AddLine(wxString::Format(" \"%s\" : { ", GetKey().c_str())); @@ -95,10 +91,35 @@ file.AddLine(wxString::Format(" \"Output\" : ")); file.AddLine(wxString::Format(" %s, ", outputLabel.c_str())); - file.AddLine(wxString::Format(" \"Python Code\" : ")); + file.AddLine(wxString::Format(" \"First worker\" : ")); file.AddLine(wxString::Format(" \"%s\", ", displayData[1].data.c_str())); + file.AddLine(wxString::Format(" \"Second worker\" : ")); + file.AddLine(wxString::Format(" \"%s\", ", displayData[2].data.c_str())); + file.AddLine(wxString::Format(" },")); return true; +} + +bool DndShapeTransferMedia::TestInternalVariables() +{ + DndShape::TestInternalVariables(); + + bool firstEmpty = displayData[1].data.IsEmpty(); + bool secondEmpty = displayData[2].data.IsEmpty(); + + if (firstEmpty) + SetCompileError(wxT("You must supply a valid python expression as the name of the first SofaSwitch worker")); + + if (secondEmpty) + SetCompileError(wxT("You must supply a valid python expression as the name of the second SofaSwitch worker")); + + if (firstEmpty && secondEmpty) + SetCompileError(wxT("You must supply a valid python expression for the names of the two SofaSwitch workers")); + + if (firstEmpty || secondEmpty) + return false; + + return true; } Modified: sofaswitch/trunk/callflow/src/transfermedia.h ============================================================================== --- sofaswitch/trunk/callflow/src/transfermedia.h (original) +++ sofaswitch/trunk/callflow/src/transfermedia.h Sun Sep 24 21:44:15 2006 @@ -1,30 +1,35 @@ -#ifndef SHAPE_PYTHON_H +#ifndef SHAPE_TRANSFERMEDIA_H -#define SHAPE_PYTHON_H +#define SHAPE_TRANSFERMEDIA_H #include "dnd.h" ////////////////////////////////////////////////////////////////////////// -/**Define a shape to indicate an arbitrary block of python code. +/**Define a shape which asks one sofaswitch worker to exchange media with another + sofaswitch worker. */ -class DndShapePython : public DndShape +class DndShapeTransferMedia : public DndShape { public: /**Construtor, Define this shape in terms of size and points etc */ - DndShapePython(); + DndShapeTransferMedia(); /**Destroy this shape, and log it */ - virtual ~DndShapePython() + virtual ~DndShapeTransferMedia() { } /**Draw this particular shape to the screen..*/ virtual void Draw(wxDC& dc); + /**Make cerrtain that the intenal variables have been set correctly, so + this shape will compile into good code */ + virtual bool TestInternalVariables(); + /** Used to report the name of this particular class. */ - static wxString GetKindName() { return wxString("Python"); } + static wxString GetKindName() { return wxString("Transfer Media"); } - /**Write the code generic to this Python code shape */ + /**Write the code generic to this TransferMedia code shape */ virtual bool WriteSystemCode(wxTextFile & file); /**Write the dictionary containing relevant points for this shape */

1 0

[Sofaswitch-svn] [commit] r119 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 24 Sep '06

24 Sep '06

Author: derek Date: Sun Sep 24 19:05:05 2006 New Revision: 119 Added: sofaswitch/trunk/callflow/src/loadnewgraph.cpp sofaswitch/trunk/callflow/src/loadnewgraph.h sofaswitch/trunk/callflow/src/transfermedia.cpp sofaswitch/trunk/callflow/src/transfermedia.h Modified: sofaswitch/trunk/callflow/src/callflow.cpp sofaswitch/trunk/callflow/src/callflow.h sofaswitch/trunk/callflow/src/dnd.cpp sofaswitch/trunk/callflow/src/dnd.h Log: Work towards adding transfermedia, and load new graph options. Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Sun Sep 24 19:05:05 2006 @@ -41,7 +41,9 @@ #include "bitmaps/compile.xpm" #include "bitmaps/eventer.xpm" #include "bitmaps/miniclock.xpm" +#include "bitmaps/newgraph.xpm" #include "bitmaps/stoptimer.xpm" +#include "bitmaps/transfermedia.xpm" class MyFrame ; @@ -303,7 +305,8 @@ toolBar->AddTool(wxH_CONTROLSPYTHON, wxBitmap ( Python_xpm ), wxT("arbitrary python code")); toolBar->AddTool(wxH_CONTROLSCONNECT_OBJECTS, wxBitmap ( JoinObjects ), wxT("Join objects with multi segmented lines")); - + toolBar->AddTool(wxH_CONTROLSTRANSFERMEDIA, wxBitmap ( transfermedia ), wxT("transfer media between workers")); + toolBar->AddTool(wxH_CONTROLSNEWGRAPH, 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")); @@ -380,6 +383,18 @@ void MyFrame::OnControlspython (wxCommandEvent & WXUNUSED(event)) { imageTypeForPlacing = DndShape::Python; + canvas->SetEditingMode(MyCanvas::PlaceOneShape); +} + +void MyFrame::OnControlsTransferMedia (wxCommandEvent & WXUNUSED(event)) +{ + imageTypeForPlacing = DndShape::TransferMedia; + canvas->SetEditingMode(MyCanvas::PlaceOneShape); +} + +void MyFrame::OnControlsLoadNewGraph (wxCommandEvent & WXUNUSED(event)) +{ + imageTypeForPlacing = DndShape::LoadNewGraph; canvas->SetEditingMode(MyCanvas::PlaceOneShape); } Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Sun Sep 24 19:05:05 2006 @@ -29,6 +29,8 @@ wxH_CONTROLSPYTHON, wxH_CONTROLSCONNECT_OBJECTS, wxH_CONTROLSCOMPILE, + wxH_CONTROLSTRANFERMEDIA, + wxH_CONTROLSNEWGRAPH, wxH_HELPMANUAL, wxH_HELPABOUT, wxH_EDITCUT, @@ -133,6 +135,18 @@ current graph. This starts a timer, which will generate an event of the specified name. */ void OnControlsTimer (wxCommandEvent & event); + + /**Called in response to a user comand to add a "transfer media from one + sofaswitch worker to another" widget to the current graph. This is + used, at call setup, to connect a voip node with a sound device.. */ + void OnControlsTransferz,edia(wxCommandEvent & event); + + /**Called in response to a user comand to add a "Load a New Graph" widget + to the current graph. The load new graph causes a new separate stream + of execution to start, where processing is happening at two places at + once. This is used to handle, say, incoming calls, or to make an + outgong call. */ + void OnControlsLoadNewGraph(wxCommandEvent & event); /**Called in response to a user comand to add a "Draw Line Segment" widget to the current graph. The multiple line segment object is used to join Modified: sofaswitch/trunk/callflow/src/dnd.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.cpp (original) +++ sofaswitch/trunk/callflow/src/dnd.cpp Sun Sep 24 19:05:05 2006 @@ -399,6 +399,12 @@ if (thisKind == Eventer) return DndShapeEventer::GetKindName(); + if (thisKind == TransferMedia) + return DndShapeTransferMedia::GetKindName(); + + if (thisKind == LoadNewGraph) + return DndShapeLoadNewGraph::GetKindName(); + wxString answer = wxString::Format("node kind is %d", thisKind); return answer; } Modified: sofaswitch/trunk/callflow/src/dnd.h ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.h (original) +++ sofaswitch/trunk/callflow/src/dnd.h Sun Sep 24 19:05:05 2006 @@ -265,6 +265,8 @@ /**12*/ Timer /**Initiate a timer, which runs for some specified time interval */, /**13*/ StopTimer /**Stop a running timer, so it will not generate an event etc */, /**14*/ Eventer /**Mark me as registering for an event. Possibly, wait for the registered for event */, + /**15*/ TransferMedia /**Transfer media from one sofaswitch entity to another */, + /**16*/ LoadNewGraph /**Read in an existing graph file (pre compiled) for a new thread of exeuction */, /* 15*/ KnownShapes /**Indicates the number of known shapes we can manage */ }; Added: sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/src/loadnewgraph.cpp Sun Sep 24 19:05:05 2006 @@ -0,0 +1,104 @@ +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + + +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif +#include <wx/textfile.h> +#include <wx/tokenzr.h> +#include "shapelist.h" + + +#include "python.h" + + +///////////////////////////////////////////////////////////////////////////// +DndShapePython::DndShapePython() + : DndShape(Python) +{ + wxSize newSize(50, 50); + SetSize(newSize); + + relInputPoints.Add(25, 0); + relOutputPoints.Add(25, 50); + + displayData[displayData.size()] = + InformationSection(wxT("Python Code"), wxT("self.i = 0")); + + AdjustIoPoints(); +} + +void DndShapePython::Draw(wxDC& dc) +{ + DrawCompileError(dc); + dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); + + wxPoint p1(m_rect.GetPosition()); + wxPoint pA(p1.x + 25, p1.y + 15); + wxPoint pB(p1.x + 25, p1.y + 0); + wxPoint pC(p1.x + 25, p1.y + 50); + + DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); + DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); + dc.DrawLine(pC, pB); + + DrawBox(dc, 0, 10, 21, 21); + DrawBox(dc, 29, 10, 21, 21); + + wxString text("Pyt"); + dc.SetFont(*wxITALIC_FONT); + wxCoord w, h; + dc.GetTextExtent(text, &w, &h); + int xPos = m_rect.x + 0 + ((21 - w)/2); + int yPos = m_rect.y + 10 + ((21 - h)/2); + dc.DrawText(text, xPos, yPos); + + text = "hon"; + dc.GetTextExtent(text, &w, &h); + xPos = m_rect.x + 29 + ((21 - w)/2); + yPos = m_rect.y + 10 + ((21 - h)/2); + dc.DrawText(text, xPos, yPos); + + + DrawBox(dc, 0, 35, 13, 13); + DrawBox(dc, 37, 35, 13, 13); + + DndShape::Draw(dc); +} + +bool DndShapePython::WriteSystemCode(wxTextFile & file) +{ + file.AddLine(" def Python(self, sTuple): "); + file.AddLine(" a,b,c = sTuple"); + file.AddLine(" exec(self.data[a][\"Python Code\"])"); + file.AddLine(" return self.data[a][\"Output\"]"); + file.AddLine(""); + + return true; +} + +bool DndShapePython::WriteThisShapeInfo(wxTextFile & file) +{ + file.AddLine(wxString::Format(" \"%s\" : { ", GetKey().c_str())); + + wxNode *inputNode = (wxNode *)GetInputPoints().GetFirst(); + const wxString & inputLabel = ((LabelledPoint *)inputNode->GetData())->GetFullLabel(); + file.AddLine(wxString::Format(" \"Input\" : ")); + file.AddLine(wxString::Format(" %s, ", inputLabel.c_str())); + + wxNode *outputNode = (wxNode *)GetOutputPoints().GetFirst(); + const wxString & outputLabel = ((LabelledPoint *)outputNode->GetData())->GetFullLabel(); + file.AddLine(wxString::Format(" \"Output\" : ")); + file.AddLine(wxString::Format(" %s, ", outputLabel.c_str())); + + file.AddLine(wxString::Format(" \"Python Code\" : ")); + file.AddLine(wxString::Format(" \"%s\", ", displayData[1].data.c_str())); + + file.AddLine(wxString::Format(" },")); + + return true; +} Added: sofaswitch/trunk/callflow/src/loadnewgraph.h ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/src/loadnewgraph.h Sun Sep 24 19:05:05 2006 @@ -0,0 +1,35 @@ +#ifndef SHAPE_PYTHON_H + +#define SHAPE_PYTHON_H + +#include "dnd.h" + +////////////////////////////////////////////////////////////////////////// +/**Define a shape to indicate an arbitrary block of python code. + */ +class DndShapePython : public DndShape +{ +public: + /**Construtor, Define this shape in terms of size and points etc */ + DndShapePython(); + + /**Destroy this shape, and log it */ + virtual ~DndShapePython() + { + } + + /**Draw this particular shape to the screen..*/ + virtual void Draw(wxDC& dc); + + /** Used to report the name of this particular class. */ + static wxString GetKindName() { return wxString("Python"); } + + /**Write the code generic to this Python code shape */ + virtual bool WriteSystemCode(wxTextFile & file); + + /**Write the dictionary containing relevant points for this shape */ + virtual bool WriteThisShapeInfo(wxTextFile & file); +}; + + +#endif Added: sofaswitch/trunk/callflow/src/transfermedia.cpp ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/src/transfermedia.cpp Sun Sep 24 19:05:05 2006 @@ -0,0 +1,104 @@ +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + + +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif +#include <wx/textfile.h> +#include <wx/tokenzr.h> +#include "shapelist.h" + + +#include "python.h" + + +///////////////////////////////////////////////////////////////////////////// +DndShapePython::DndShapePython() + : DndShape(Python) +{ + wxSize newSize(50, 50); + SetSize(newSize); + + relInputPoints.Add(25, 0); + relOutputPoints.Add(25, 50); + + displayData[displayData.size()] = + InformationSection(wxT("Python Code"), wxT("self.i = 0")); + + AdjustIoPoints(); +} + +void DndShapePython::Draw(wxDC& dc) +{ + DrawCompileError(dc); + dc.SetBrush(wxBrush(*wxBLACK, wxSOLID)); + + wxPoint p1(m_rect.GetPosition()); + wxPoint pA(p1.x + 25, p1.y + 15); + wxPoint pB(p1.x + 25, p1.y + 0); + wxPoint pC(p1.x + 25, p1.y + 50); + + DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); + DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); + dc.DrawLine(pC, pB); + + DrawBox(dc, 0, 10, 21, 21); + DrawBox(dc, 29, 10, 21, 21); + + wxString text("Pyt"); + dc.SetFont(*wxITALIC_FONT); + wxCoord w, h; + dc.GetTextExtent(text, &w, &h); + int xPos = m_rect.x + 0 + ((21 - w)/2); + int yPos = m_rect.y + 10 + ((21 - h)/2); + dc.DrawText(text, xPos, yPos); + + text = "hon"; + dc.GetTextExtent(text, &w, &h); + xPos = m_rect.x + 29 + ((21 - w)/2); + yPos = m_rect.y + 10 + ((21 - h)/2); + dc.DrawText(text, xPos, yPos); + + + DrawBox(dc, 0, 35, 13, 13); + DrawBox(dc, 37, 35, 13, 13); + + DndShape::Draw(dc); +} + +bool DndShapePython::WriteSystemCode(wxTextFile & file) +{ + file.AddLine(" def Python(self, sTuple): "); + file.AddLine(" a,b,c = sTuple"); + file.AddLine(" exec(self.data[a][\"Python Code\"])"); + file.AddLine(" return self.data[a][\"Output\"]"); + file.AddLine(""); + + return true; +} + +bool DndShapePython::WriteThisShapeInfo(wxTextFile & file) +{ + file.AddLine(wxString::Format(" \"%s\" : { ", GetKey().c_str())); + + wxNode *inputNode = (wxNode *)GetInputPoints().GetFirst(); + const wxString & inputLabel = ((LabelledPoint *)inputNode->GetData())->GetFullLabel(); + file.AddLine(wxString::Format(" \"Input\" : ")); + file.AddLine(wxString::Format(" %s, ", inputLabel.c_str())); + + wxNode *outputNode = (wxNode *)GetOutputPoints().GetFirst(); + const wxString & outputLabel = ((LabelledPoint *)outputNode->GetData())->GetFullLabel(); + file.AddLine(wxString::Format(" \"Output\" : ")); + file.AddLine(wxString::Format(" %s, ", outputLabel.c_str())); + + file.AddLine(wxString::Format(" \"Python Code\" : ")); + file.AddLine(wxString::Format(" \"%s\", ", displayData[1].data.c_str())); + + file.AddLine(wxString::Format(" },")); + + return true; +} Added: sofaswitch/trunk/callflow/src/transfermedia.h ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/src/transfermedia.h Sun Sep 24 19:05:05 2006 @@ -0,0 +1,35 @@ +#ifndef SHAPE_PYTHON_H + +#define SHAPE_PYTHON_H + +#include "dnd.h" + +////////////////////////////////////////////////////////////////////////// +/**Define a shape to indicate an arbitrary block of python code. + */ +class DndShapePython : public DndShape +{ +public: + /**Construtor, Define this shape in terms of size and points etc */ + DndShapePython(); + + /**Destroy this shape, and log it */ + virtual ~DndShapePython() + { + } + + /**Draw this particular shape to the screen..*/ + virtual void Draw(wxDC& dc); + + /** Used to report the name of this particular class. */ + static wxString GetKindName() { return wxString("Python"); } + + /**Write the code generic to this Python code shape */ + virtual bool WriteSystemCode(wxTextFile & file); + + /**Write the dictionary containing relevant points for this shape */ + virtual bool WriteThisShapeInfo(wxTextFile & file); +}; + + +#endif

1 0

[Sofaswitch-svn] [commit] r118 - sofaswitch/trunk/callflow/bitmaps
by SofaSWITCH SVN 24 Sep '06

24 Sep '06

Author: derek Date: Sun Sep 24 18:45:16 2006 New Revision: 118 Added: sofaswitch/trunk/callflow/bitmaps/newgraph.xpm Log: Add a new graph icon, so we can link to multiple graph files. Added: sofaswitch/trunk/callflow/bitmaps/newgraph.xpm ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/bitmaps/newgraph.xpm Sun Sep 24 18:45:16 2006 @@ -0,0 +1,40 @@ +/* XPM */ +static char *newgraph[]={ +"32 32 5 1", +"# c None", +"b c #000000", +"c c #0058c0", +". c #00ff00", +"a c #ffff00", +".#######a######.########a######.", +"a.######a######.########a#####.a", +"aa.#####a######.#######a#####.a#", +"#aa.#####a#####.#######a####.aa#", +"##aa.####a############a####.aa##", +"###aa.####abbbbbbbbb##a###.aa###", +"####aa.###abcccccccb#a###.a#####", +"#####aa.##abbbbbbbbb#a##.aa#####", +"######aa.##a###b####a##.aa######", +"a######aa.#a###b####a#.aa######a", +"#aa#####aa.bbbbbbbbb#.aa#####aa#", +"###aa####aabaccccccb.aa####aa###", +"#####aa###abbbbbbbbbaa##bbbbbb##", +"#######aa##aaa#b##aaa##abccccb##", +"#########aaaaa.b#aaaaaa#bbbbbb##", +"....########aaab.aaa#######b....", +"....#######bbbbbbbbb#######b....", +"###########baaaaaaab#######b####", +"###########baaaaaaab#######b####", +"#########aabbbbbbbbbaaa####b####", +"#######aa##.aaaba#aa.##aa##b####", +"#####aa###.aa#aba##aa.###aab####", +"###aa####.aa#a#b#a##aa.####aa###", +"aaa#####.aa##a#b#a###aa.###b#aaa", +"#bbbbbbbbbb#a##b##a###aa.##b####", +"#bcccc.cccbbbbbbbbbbbbbbbbbb####", +"#bccc.ccccba###b##a#####aa.#####", +"#bcc.cccccba###b###a#####aa.####", +"#bbbbbbbbbb####b###a######aa.###", +"##.aa#####a##b#b#b##a######aa.##", +"#.aa#####a####bbb###a#######aa.#", +".aa#####a######b#####a#######aa."};

1 0

[Sofaswitch-svn] [commit] r117 - sofaswitch/trunk/callflow/bitmaps
by SofaSWITCH SVN 24 Sep '06

24 Sep '06

Author: derek Date: Sun Sep 24 18:19:15 2006 New Revision: 117 Added: sofaswitch/trunk/callflow/bitmaps/transfermedia.xpm Log: New icon to indicate transfer of media from one sofaswitch worker to another. Added: sofaswitch/trunk/callflow/bitmaps/transfermedia.xpm ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/bitmaps/transfermedia.xpm Sun Sep 24 18:19:15 2006 @@ -0,0 +1,39 @@ +/* XPM */ +static char *transfermedia[]={ +"32 32 4 1", +". c None", +"# c #000000", +"b c #ff0000", +"a c #ffffc0", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"......#.........aa.......#......", +".....##.........aaaa.....##.....", +"....#.#.........abbaaa...#.#....", +"####..#.aaaaaaaaabbbbbaa.#..####", +"#..#..#.aaaaaaaaabbbbbaa.#..#..#", +"#..#..#.........abbaaa...#..#..#", +"#..#..#.........aaaa.....#..#..#", +"#..#..#.........aa.......#..#..#", +"#..#..#..................#..#..#", +"#..#..#..................#..#..#", +"#..#..#..................#..#..#", +"#..#..#.......aa.........#..#..#", +"#..#..#.....aaaa.........#..#..#", +"#..#..#...aaabba.........#..#..#", +"#..#..#.aabbbbbaaaaaaaaa.#..#..#", +"####..#.aabbbbbaaaaaaaaa.#..####", +"....#.#...aaabba.........#.#....", +".....##.....aaaa.........##.....", +"......#.......aa.........#......", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................"};

1 0

[Sofaswitch-svn] [commit] r116 - sofaswitch/trunk/callflow
by SofaSWITCH SVN 22 Sep '06

22 Sep '06

Author: derek Date: Fri Sep 22 01:12:57 2006 New Revision: 116 Modified: sofaswitch/trunk/callflow/Makefile.am Log: Sort out doc build targets to work reliably. Modified: sofaswitch/trunk/callflow/Makefile.am ============================================================================== --- sofaswitch/trunk/callflow/Makefile.am (original) +++ sofaswitch/trunk/callflow/Makefile.am Fri Sep 22 01:12:57 2006 @@ -7,12 +7,18 @@ both:all -docs: +docs:dox + +dox: doxygen callflow.dxy + veryclean:distclean @rm -fR html + @rm -fR *~ + @rm log + help: @echo " " @echo "Available make targets" @@ -26,6 +32,7 @@ @echo " " @echo "doc generate html description files of the source code" @echo "docs generate html description files of the source code" + @echo "dox generate html description files of the source code" @echo " " @echo "help print this message out" @echo " "

1 0

[Sofaswitch-svn] [commit] r115 - in sofaswitch/trunk/callflow: . docs
by SofaSWITCH SVN 22 Sep '06

22 Sep '06

Author: derek Date: Fri Sep 22 00:09:22 2006 New Revision: 115 Modified: sofaswitch/trunk/callflow/callflow.dxy sofaswitch/trunk/callflow/docs/executionflow.dxy Log: Fix docs so it compiles. Modified: sofaswitch/trunk/callflow/callflow.dxy ============================================================================== --- sofaswitch/trunk/callflow/callflow.dxy (original) +++ sofaswitch/trunk/callflow/callflow.dxy Fri Sep 22 00:09:22 2006 @@ -81,7 +81,7 @@ EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -IMAGE_PATH = +IMAGE_PATH = src docs INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO Modified: sofaswitch/trunk/callflow/docs/executionflow.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/executionflow.dxy (original) +++ sofaswitch/trunk/callflow/docs/executionflow.dxy Fri Sep 22 00:09:22 2006 @@ -5,7 +5,7 @@ The flow of execution is to follow the graph on the screen. Thus, when given a graph like -\image html1 forloop.png +\image html forloop.png it will enter the forloop, and go around and around until the termination condition is met. @@ -15,7 +15,7 @@ or passes through an Eventer type structure and goes nowhere. Consider the following graph -\image html2 simpleevent.png +\image html simpleevent.png Execution starts at the top, moves to the next node which sends off a request to obtain a new worker node. Then, the eventer box is entered, where we

1 0

[Sofaswitch-svn] [commit] r114 - sofaswitch/trunk/callflow
by SofaSWITCH SVN 22 Sep '06

22 Sep '06

Author: derek Date: Fri Sep 22 00:04:14 2006 New Revision: 114 Removed: sofaswitch/trunk/callflow/overview.dxy Modified: sofaswitch/trunk/callflow/callflow.dxy Log: Docs docs docs. Modified: sofaswitch/trunk/callflow/callflow.dxy ============================================================================== --- sofaswitch/trunk/callflow/callflow.dxy (original) +++ sofaswitch/trunk/callflow/callflow.dxy Fri Sep 22 00:04:14 2006 @@ -72,8 +72,8 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = src . -FILE_PATTERNS = *.h overview.dxy +INPUT = src docs . +FILE_PATTERNS = *.h *.dxy RECURSIVE = NO EXCLUDE = EXCLUDE_SYMLINKS = NO

1 0

[Sofaswitch-svn] [commit] r113 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 22 Sep '06

22 Sep '06

Author: derek Date: Fri Sep 22 00:03:35 2006 New Revision: 113 Added: sofaswitch/trunk/callflow/docs/executionflow.dxy sofaswitch/trunk/callflow/docs/simpleevent.png (contents, props changed) Log: Add files to svn. Added: sofaswitch/trunk/callflow/docs/executionflow.dxy ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/docs/executionflow.dxy Fri Sep 22 00:03:35 2006 @@ -0,0 +1,53 @@ +/*! \page pageExecutionFlow Flow of execution through python code + +\section secOverview Oversight + +The flow of execution is to follow the graph on the screen. Thus, when +given a graph like + +\image html1 forloop.png + +it will enter the forloop, and go around and around until the termination +condition is met. + +While processing each of the nodes in the supplied graph, it is ignoring +all timer events. Execution continues until it falls of the end of the graph, +or passes through an Eventer type structure and goes nowhere. Consider the +following graph + +\image html2 simpleevent.png + +Execution starts at the top, moves to the next node which sends off a request +to obtain a new worker node. Then, the eventer box is entered, where we +register to receive any event that contains the word "NEW" (we are searching +for all events advising of a new node). At which point, execution continues to +the right, and goes into the lower "execute python code" box, which prints a +message. Finally, execution moves into the bottom most box, and stops. + +At this point, we rely upon the twisted module in python to call methods +indicating that things have happened (e.g. a timer, data received from network +etc). On receipt of a message about a new node, the box on the star output of +the eventer is processed. In this case, python code is executed which reports +the id of the voip node created. Execution then moves to the end, and stops. + +Should there be a new event (which we have previously registered for with an +Eventer box) execution will return there. Consequently, in the above example, +every time a new node is created, execution will always move back to the left +most execute python box. + +Note that network events, timer events, other events, are only processed when +execution has stopped. + + + + + + + + + + + + + +*/ \ No newline at end of file Added: sofaswitch/trunk/callflow/docs/simpleevent.png ============================================================================== Binary file. No diff available.

1 0