September 2006 - sofaswitch-svn@lists.freeswitch.org

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

28 Sep '06

Author: derek Date: Thu Sep 28 03:18:01 2006 New Revision: 145 Removed: sofaswitch/trunk/callflow/bitmaps/death.xpm~ Log: Remove this file accidentally added.

1 0

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

28 Sep '06

Author: derek Date: Thu Sep 28 03:17:29 2006 New Revision: 144 Added: sofaswitch/trunk/callflow/bitmaps/death.xpm sofaswitch/trunk/callflow/bitmaps/death.xpm~ Log: Add this skull and crossbones image. Added: sofaswitch/trunk/callflow/bitmaps/death.xpm ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/bitmaps/death.xpm Thu Sep 28 03:17:29 2006 @@ -0,0 +1,148 @@ +/* XPM */ +static char *death[] = { +/* columns rows colors chars-per-pixel */ +"24 24 118 2", +" c #000000", +". c #010101", +"X c #020202", +"o c #030303", +"O c #040404", +"+ c #050505", +"@ c #060606", +"# c #070707", +"$ c #080808", +"% c #090909", +"& c #0A0A0A", +"* c #0B0B0B", +"= c #0C0C0C", +"- c #0D0D0D", +"; c #0E0E0E", +": c #101010", +"> c #121212", +", c #131313", +"< c #151515", +"1 c #161616", +"2 c #171717", +"3 c #1C1C1C", +"4 c #1F1F1F", +"5 c #202020", +"6 c #212121", +"7 c #242424", +"8 c #262626", +"9 c #282828", +"0 c #2A2A2A", +"q c #2B2B2B", +"w c #2C2C2C", +"e c #2E2E2E", +"r c #2F2F2F", +"t c #333333", +"y c #363636", +"u c #373737", +"i c #3A3A3A", +"p c #3B3B3B", +"a c #3D3D3D", +"s c #3F3F3F", +"d c #404040", +"f c #434343", +"g c #454545", +"h c #4B4B4B", +"j c #4C4C4C", +"k c #4D4D4D", +"l c #525252", +"z c #535353", +"x c #575757", +"c c #585858", +"v c #5D5D5D", +"b c #5E5E5E", +"n c #636363", +"m c #656565", +"M c #6F6F6F", +"N c #747474", +"B c #777777", +"V c #7B7B7B", +"C c #7C7C7C", +"Z c #818181", +"A c #838383", +"S c #888888", +"D c #898989", +"F c #8C8C8C", +"G c #8F8F8F", +"H c #909090", +"J c #939393", +"K c #949494", +"L c #959595", +"P c #969696", +"I c #989898", +"U c #9C9C9C", +"Y c #A0A0A0", +"T c #A5A5A5", +"R c #A8A8A8", +"E c #AAAAAA", +"W c #ACACAC", +"Q c #AEAEAE", +"! c #B0B0B0", +"~ c #B1B1B1", +"^ c #B3B3B3", +"/ c #B4B4B4", +"( c #B6B6B6", +") c #B7B7B7", +"_ c #BEBEBE", +"` c #C0C0C0", +"' c #C2C2C2", +"] c #C5C5C5", +"[ c #C6C6C6", +"{ c #C7C7C7", +"} c #C8C8C8", +"| c #CACACA", +" . c #CFCFCF", +".. c #D0D0D0", +"X. c #D7D7D7", +"o. c #D8D8D8", +"O. c #DADADA", +"+. c #DCDCDC", +"@. c #DEDEDE", +"#. c #DFDFDF", +"$. c #E0E0E0", +"%. c #E1E1E1", +"&. c #E5E5E5", +"*. c #E8E8E8", +"=. c #EFEFEF", +"-. c #F0F0F0", +";. c #F3F3F3", +":. c #F5F5F5", +">. c #F6F6F6", +",. c #F7F7F7", +"<. c #F8F8F8", +"1. c #F9F9F9", +"2. c #FAFAFA", +"3. c #FBFBFB", +"4. c #FCFCFC", +"5. c #FDFDFD", +"6. c #FEFEFE", +"7. c gray100", +/* pixels */ +" + + $ $ $ $ - + + + + ", +" $ $ + + + ", +" + u G D G N > + $ ", +" D 7.7.7.7.7.+.8 + ", +" s 7.>.>.1.>.>.7.^ + + ", +" + W 7.>.7.7.7.1.1.7.8 + ", +" E 7.=.;.7.1.&.1.7.q + ", +" + K 7.v l 7.[ 1 %.7.3 + ", +" 5 7.h s 7.( +.K + ", +" + ( 1.&.[ %.O.7.e + ", +" + h ..7.m { >.G - + $ ", +" + $ I ..W { ;.5 $ ", +" + + $ T _ 1 V O. + + ", +" + t z 2 $ ( 7.;.d 3 c > ", +" $ U 7.` > - s q > { 7.8 ", +" + + [ 7.7.;.A u d O.7.7.c ", +" 5 ^ ^ h A >.7.T ^ +.W s U V ", +" + + l +.7.7.G $ ", +" + + 1 V 1.;.e G 7.[ u + ", +" > A +.+.7.I - + d >.>.&.n ", +" $ 1 %.7.7.{ + + $ n 7.7.N + ", +" - - q I u $ + + t K q ", +" + $ + + + + $ + ", +" + + $ + + $ $ " +}; Added: sofaswitch/trunk/callflow/bitmaps/death.xpm~ ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/bitmaps/death.xpm~ Thu Sep 28 03:17:29 2006 @@ -0,0 +1,148 @@ +/* XPM */ +static char *death3[] = { +/* columns rows colors chars-per-pixel */ +"24 24 118 2", +" c #000000", +". c #010101", +"X c #020202", +"o c #030303", +"O c #040404", +"+ c #050505", +"@ c #060606", +"# c #070707", +"$ c #080808", +"% c #090909", +"& c #0A0A0A", +"* c #0B0B0B", +"= c #0C0C0C", +"- c #0D0D0D", +"; c #0E0E0E", +": c #101010", +"> c #121212", +", c #131313", +"< c #151515", +"1 c #161616", +"2 c #171717", +"3 c #1C1C1C", +"4 c #1F1F1F", +"5 c #202020", +"6 c #212121", +"7 c #242424", +"8 c #262626", +"9 c #282828", +"0 c #2A2A2A", +"q c #2B2B2B", +"w c #2C2C2C", +"e c #2E2E2E", +"r c #2F2F2F", +"t c #333333", +"y c #363636", +"u c #373737", +"i c #3A3A3A", +"p c #3B3B3B", +"a c #3D3D3D", +"s c #3F3F3F", +"d c #404040", +"f c #434343", +"g c #454545", +"h c #4B4B4B", +"j c #4C4C4C", +"k c #4D4D4D", +"l c #525252", +"z c #535353", +"x c #575757", +"c c #585858", +"v c #5D5D5D", +"b c #5E5E5E", +"n c #636363", +"m c #656565", +"M c #6F6F6F", +"N c #747474", +"B c #777777", +"V c #7B7B7B", +"C c #7C7C7C", +"Z c #818181", +"A c #838383", +"S c #888888", +"D c #898989", +"F c #8C8C8C", +"G c #8F8F8F", +"H c #909090", +"J c #939393", +"K c #949494", +"L c #959595", +"P c #969696", +"I c #989898", +"U c #9C9C9C", +"Y c #A0A0A0", +"T c #A5A5A5", +"R c #A8A8A8", +"E c #AAAAAA", +"W c #ACACAC", +"Q c #AEAEAE", +"! c #B0B0B0", +"~ c #B1B1B1", +"^ c #B3B3B3", +"/ c #B4B4B4", +"( c #B6B6B6", +") c #B7B7B7", +"_ c #BEBEBE", +"` c #C0C0C0", +"' c #C2C2C2", +"] c #C5C5C5", +"[ c #C6C6C6", +"{ c #C7C7C7", +"} c #C8C8C8", +"| c #CACACA", +" . c #CFCFCF", +".. c #D0D0D0", +"X. c #D7D7D7", +"o. c #D8D8D8", +"O. c #DADADA", +"+. c #DCDCDC", +"@. c #DEDEDE", +"#. c #DFDFDF", +"$. c #E0E0E0", +"%. c #E1E1E1", +"&. c #E5E5E5", +"*. c #E8E8E8", +"=. c #EFEFEF", +"-. c #F0F0F0", +";. c #F3F3F3", +":. c #F5F5F5", +">. c #F6F6F6", +",. c #F7F7F7", +"<. c #F8F8F8", +"1. c #F9F9F9", +"2. c #FAFAFA", +"3. c #FBFBFB", +"4. c #FCFCFC", +"5. c #FDFDFD", +"6. c #FEFEFE", +"7. c gray100", +/* pixels */ +" + + $ $ $ $ - + + + + ", +" $ $ + + + ", +" + u G D G N > + $ ", +" D 7.7.7.7.7.+.8 + ", +" s 7.>.>.1.>.>.7.^ + + ", +" + W 7.>.7.7.7.1.1.7.8 + ", +" E 7.=.;.7.1.&.1.7.q + ", +" + K 7.v l 7.[ 1 %.7.3 + ", +" 5 7.h s 7.( +.K + ", +" + ( 1.&.[ %.O.7.e + ", +" + h ..7.m { >.G - + $ ", +" + $ I ..W { ;.5 $ ", +" + + $ T _ 1 V O. + + ", +" + t z 2 $ ( 7.;.d 3 c > ", +" $ U 7.` > - s q > { 7.8 ", +" + + [ 7.7.;.A u d O.7.7.c ", +" 5 ^ ^ h A >.7.T ^ +.W s U V ", +" + + l +.7.7.G $ ", +" + + 1 V 1.;.e G 7.[ u + ", +" > A +.+.7.I - + d >.>.&.n ", +" $ 1 %.7.7.{ + + $ n 7.7.N + ", +" - - q I u $ + + t K q ", +" + $ + + + + $ + ", +" + + $ + + $ $ " +};

1 0

[Sofaswitch-svn] [commit] r143 - in sofaswitch/trunk/callflow: src tests
by SofaSWITCH SVN 28 Sep '06

28 Sep '06

Author: derek Date: Thu Sep 28 00:54:02 2006 New Revision: 143 Modified: sofaswitch/trunk/callflow/src/callstartstop.cpp sofaswitch/trunk/callflow/src/conditional.cpp sofaswitch/trunk/callflow/src/death.cpp sofaswitch/trunk/callflow/src/shapelist.cpp sofaswitch/trunk/callflow/src/stoptimer.cpp sofaswitch/trunk/callflow/src/transfermedia.cpp sofaswitch/trunk/callflow/tests/makevoipcall.src Log: Patches to fix niggly issues. Modified: sofaswitch/trunk/callflow/src/callstartstop.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callstartstop.cpp (original) +++ sofaswitch/trunk/callflow/src/callstartstop.cpp Thu Sep 28 00:54:02 2006 @@ -26,8 +26,12 @@ relInputPoints.Add(25, 0); relOutputPoints.Add(25, 50); - displayData[displayData.size()] = - InformationSection(wxT("Worker node to activate (python code)"), wxT("\"voip1\"")); + if (kindToMake == MakeCall) + displayData[displayData.size()] = + InformationSection(wxT("Worker node to activate (python code)"), wxT("\"voip1\"")); + else + displayData[displayData.size()] = + InformationSection(wxT("Worker node to close call (python code)"), wxT("\"voip1\"")); AdjustIoPoints(); } Modified: sofaswitch/trunk/callflow/src/conditional.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/conditional.cpp (original) +++ sofaswitch/trunk/callflow/src/conditional.cpp Thu Sep 28 00:54:02 2006 @@ -96,7 +96,8 @@ file.AddLine(wxString::Format(" \"%s\" : { ", GetKey().c_str())); file.AddLine(wxString::Format(" \"Test\" : ")); - file.AddLine(wxString::Format(" \"%s\", ", displayData[1].data.c_str())); + wxString dest = ProtectString(displayData[1].data); + file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); wxNode *outputNode = (wxNode *)GetOutputPoints().GetFirst(); const wxString & outputLabel = ((LabelledPoint *)outputNode->GetData())->GetFullLabel(); Modified: sofaswitch/trunk/callflow/src/death.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/death.cpp (original) +++ sofaswitch/trunk/callflow/src/death.cpp Thu Sep 28 00:54:02 2006 @@ -51,8 +51,7 @@ file.AddLine(" def Death(self, sTuple): "); file.AddLine(" \"\"\"Terminate processing of this flow chart, by closing this whole thing down "); file.AddLine(" \"\"\" "); - file.AddLine(" a,b,c = sTuple "); - file.AddLine(" #print \"end of processing at \", a "); + file.AddLine(" reactor.disconnectAll() "); file.AddLine(" return None "); file.AddLine(" "); Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Thu Sep 28 00:54:02 2006 @@ -460,7 +460,6 @@ file.AddLine(" has been lost. Currently, we do nothing with this information. It could be "); file.AddLine(" used though to connect elsewhere. "); file.AddLine(" \"\"\" "); - file.AddLine(" print \"connection lost\" "); file.AddLine(" "); file.AddLine(" def dataReceived(self, data): "); file.AddLine(" \"\"\"A twisted callback which happens each time we receive a message from the sofa "); @@ -468,6 +467,7 @@ file.AddLine(" initialise, and activate the next step of initialise. Or, it is an ordinary "); file.AddLine(" message that has to be processed "); file.AddLine(" \"\"\" "); + file.AddLine(" print \"Received the message \", data "); file.AddLine(" while data.find(\" \") >= 0: "); file.AddLine(" data = data.replace(\" \", \" \") "); file.AddLine(" ssdata = str(data).split(\'\\0\') "); @@ -524,7 +524,6 @@ file.AddLine(" reactor.stop() "); file.AddLine(" "); file.AddLine(" def clientConnectionLost(self, connector, reason): "); - file.AddLine(" print \"Connection lost - goodbye!\" "); file.AddLine(" reactor.stop() "); file.AddLine(" "); file.AddLine(" def buildProtocol(self, addr): "); Modified: sofaswitch/trunk/callflow/src/stoptimer.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/stoptimer.cpp (original) +++ sofaswitch/trunk/callflow/src/stoptimer.cpp Thu Sep 28 00:54:02 2006 @@ -44,7 +44,7 @@ int xPos = m_rect.x + 5 + ((40 - w)/2); int yPos = m_rect.y + 15 + ((20 - h)/2); dc.DrawText(text, xPos, yPos); - DrawBox(dc, 5, 15, 40, 20); + DrawBox(dc, 5, 30, 40, 5); DndShapeTimer::Draw(dc); } Modified: sofaswitch/trunk/callflow/src/transfermedia.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/transfermedia.cpp (original) +++ sofaswitch/trunk/callflow/src/transfermedia.cpp Thu Sep 28 00:54:02 2006 @@ -90,10 +90,12 @@ file.AddLine(wxString::Format(" %s, ", outputLabel.c_str())); file.AddLine(wxString::Format(" \"worker node\" : ")); - file.AddLine(wxString::Format(" \"%s\", ", displayData[1].data.c_str())); + wxString dest = ProtectString(displayData[1].data); + file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); file.AddLine(wxString::Format(" \"worker receiver\" : ")); - file.AddLine(wxString::Format(" \"%s\", ", displayData[2].data.c_str())); + dest = ProtectString(displayData[2].data); + file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); file.AddLine(wxString::Format(" },")); Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- sofaswitch/trunk/callflow/tests/makevoipcall.src (original) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Thu Sep 28 00:54:02 2006 @@ -1 +1 @@ -13190260 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request voip<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10282279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>2260605 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14251463 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9217357217,357,265,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9263600263,600,284,606<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request sound<ms><special> <Shape>6191209 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>10190308 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>1119068 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>voip<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>request voip<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>19238548 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>10239508 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>9287384291,384,355,385,340,602,287,606<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>11189117 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>sound<ms><special>Timer period (seconds)<ms>2<ms><special>Timer label<ms>request sound<ms><special> <Shape> +10128491 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>self.i = 0<ms><special> <Shape>9291382291,386,334,382,332,395<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9150467265,596,208,591,205,467,150,478,154,493<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request sound<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>10239508 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>14251463 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>2266623 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9217357217,357,265,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11189117 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>sound<ms><special>Timer period (seconds)<ms>2<ms><special>Timer label<ms>request sound<ms><special> <Shape>15129540 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>13190260 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request voip<ms><special> <Shape>5240549 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>10282279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>6191209 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>2307394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>10190308 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>1119068 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>voip<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>request voip<ms><special> <Shape>20127632 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>19267578 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>7129587 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r142 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 28 Sep '06

28 Sep '06

Author: derek Date: Wed Sep 27 21:50:34 2006 New Revision: 142 Added: sofaswitch/trunk/callflow/tests/dtmf_from_sound.src Log: Add this file, to indicate handling dtmf from the sound module. Added: sofaswitch/trunk/callflow/tests/dtmf_from_sound.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/dtmf_from_sound.src Wed Sep 27 21:50:34 2006 @@ -0,0 +1 @@ +10108407 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "DTMF detected is ", self.dtmfData<ms><special> <Shape>9295275295,275,348,279<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9130361258,390,131,361,130,363<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14120365 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>14246251 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>REQ<ms><special>Python variable to hold event data<ms>self.newNode<ms><special> <Shape>9135374349,374,345,440,135,455<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10323322 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "timer has expired at ", time.asctime(), " ", self.timerData<ms><special> <Shape>1231108 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2107453 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10232204 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have requested a node from sound at ", time.asctime()<ms><special> <Shape>14334283 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestnode<ms><special>Python variable to hold event data<ms>self.timerData<ms><special> <Shape>10231295 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have a new node on ", self.newNode<ms><special> <Shape>13231340 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestnode<ms><special> <Shape>11232159 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>sound<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestnode<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r141 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 28 Sep '06

28 Sep '06

Author: derek Date: Wed Sep 27 21:49:48 2006 New Revision: 141 Added: sofaswitch/trunk/callflow/tests/makevoipcall.src sofaswitch/trunk/callflow/tests/simpleeventer.src Log: Add these files to indicate different mode of operation. Added: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Wed Sep 27 21:49:48 2006 @@ -0,0 +1 @@ +13190260 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request voip<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10282279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>2260605 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14251463 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9217357217,357,265,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9263600263,600,284,606<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request sound<ms><special> <Shape>6191209 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>10190308 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>1119068 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>voip<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>request voip<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>19238548 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>10239508 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>9287384291,384,355,385,340,602,287,606<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>11189117 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>sound<ms><special>Timer period (seconds)<ms>2<ms><special>Timer label<ms>request sound<ms><special> <Shape> Added: sofaswitch/trunk/callflow/tests/simpleeventer.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/simpleeventer.src Wed Sep 27 21:49:48 2006 @@ -0,0 +1 @@ +9349148349,148,351,201<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2327251 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>128527 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>14301125 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>REQ<ms><special>Python variable to hold event data<ms>self.newNode<ms><special> <Shape>10287172 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have received a new node ", self.newNode<ms><special> <Shape>10326202 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " Finished main stream of execution "<ms><special> <Shape>9315219315,219,315,250,349,253<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1128678 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from<ms>voip<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestnode<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r140 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 28 Sep '06

28 Sep '06

Author: derek Date: Wed Sep 27 21:48:23 2006 New Revision: 140 Added: sofaswitch/trunk/callflow/tests/forloop.src Log: Initial release of a file to indicate for loops. Added: sofaswitch/trunk/callflow/tests/forloop.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/forloop.src Wed Sep 27 21:48:23 2006 @@ -0,0 +1 @@ +925884296,87,258,84,259,174,299,178<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>130611 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>329962 extra <special>Tool Tip<ms>Start For<ms><special>Initialise (Python code)<ms>self.i = 0<ms><special>Test for Termination (Python code)<ms>self.i < 10<ms><special>Increment (Python code)<ms>self.i+=1<ms><special> <Shape>10307108 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "loop index is ", self.i<ms><special> <Shape>4301152 extra <special>Tool Tip<ms>End For Loop<ms><special> <Shape>20308200 extra <special>Tool Tip<ms>Death<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r139 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 28 Sep '06

28 Sep '06

Author: derek Date: Wed Sep 27 21:47:55 2006 New Revision: 139 Added: sofaswitch/trunk/callflow/tests/simplesimple.src Log: Initial file to illustrate the start and end of a call flow. Added: sofaswitch/trunk/callflow/tests/simplesimple.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/simplesimple.src Wed Sep 27 21:47:55 2006 @@ -0,0 +1 @@ +20333121 extra <special>Tool Tip<ms>Death<ms><special> <Shape>133275 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>

1 0

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

28 Sep '06

Author: derek Date: Wed Sep 27 21:34:43 2006 New Revision: 138 Added: sofaswitch/trunk/callflow/src/death.cpp sofaswitch/trunk/callflow/src/death.h Log: Add these source files. Added: sofaswitch/trunk/callflow/src/death.cpp ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/src/death.cpp Wed Sep 27 21:34:43 2006 @@ -0,0 +1,76 @@ +#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 "death.h" +#include "bitmaps/death.xpm" + +///////////////////////////////////////////////////////////////////////////// +DndShapeDeath::DndShapeDeath() + : DndShape(Death) +{ + wxSize newSize(50, 40); + SetSize(newSize); + + relInputPoints.Add(25, 0); + AdjustIoPoints(); + + skullBitmap = wxBitmap(death); +} + +void DndShapeDeath::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 + 15); + wxPoint pB(p1.x + 25, p1.y + 0); + wxPoint pC(p1.x + 25, p1.y + 10); + dc.DrawLine(pA, pB); + DrawArrow(dc, pC, ArrowDown, InputPointConnected(0) ? Connected : Loose); + + dc.DrawBitmap(skullBitmap, p1.x + 13, p1.y + 15, true); + + DndShape::Draw(dc); +} + +bool DndShapeDeath::WriteSystemCode(wxTextFile & file) +{ + file.AddLine(" def Death(self, sTuple): "); + file.AddLine(" \"\"\"Terminate processing of this flow chart, by closing this whole thing down "); + file.AddLine(" \"\"\" "); + file.AddLine(" a,b,c = sTuple "); + file.AddLine(" #print \"end of processing at \", a "); + file.AddLine(" return None "); + file.AddLine(" "); + + return true; +} + +bool DndShapeDeath::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())); + + file.AddLine(wxString::Format(" },")); + + return true; +} + Added: sofaswitch/trunk/callflow/src/death.h ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/src/death.h Wed Sep 27 21:34:43 2006 @@ -0,0 +1,35 @@ +#ifndef DEATH_H + +#define DEATH_H + + +#include "dnd.h" + + +////////////////////////////////////////////////////////////////////////////////////////////// +/**Define a shape to indicate the end of processing completely. This instance + has the ability to draw this shape to a specified location on the canvas */ +class DndShapeDeath : public DndShape +{ +public: + /**Construtor, Define this shape in terms of size and points etc */ + DndShapeDeath(); + + /**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("Death"); } + + /**Write the code generic to this Death shape */ + virtual bool WriteSystemCode(wxTextFile & file); + + /**Write the dictionary containing relevant points for this shape */ + virtual bool WriteThisShapeInfo(wxTextFile & file); + + private: + /**The bitmap describing the image to draw */ + wxBitmap skullBitmap; +}; + +#endif

1 0

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

28 Sep '06

Author: derek Date: Wed Sep 27 21:34:12 2006 New Revision: 137 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 the death image, and make relevant changes. Modified: sofaswitch/trunk/callflow/src/Makefile.am ============================================================================== --- sofaswitch/trunk/callflow/src/Makefile.am (original) +++ sofaswitch/trunk/callflow/src/Makefile.am Wed Sep 27 21:34:12 2006 @@ -31,6 +31,7 @@ ../bitmaps/Python.xpm \ ../bitmaps/RequestNode.xpm \ ../bitmaps/compile.xpm \ + ../bitmaps/death.xpm \ ../bitmaps/endcall.xpm \ ../bitmaps/eventer.xpm \ ../bitmaps/makecall.xpm \ @@ -50,6 +51,8 @@ canvas.h \ conditional.cpp \ conditional.h \ + death.cpp \ + death.h \ dnd.cpp \ dnd.h \ drawshape.cpp \ Modified: sofaswitch/trunk/callflow/src/Makefile.in ============================================================================== --- sofaswitch/trunk/callflow/src/Makefile.in (original) +++ sofaswitch/trunk/callflow/src/Makefile.in Wed Sep 27 21:34:12 2006 @@ -49,10 +49,10 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_callflow_OBJECTS = callflow.$(OBJEXT) callstartstop.$(OBJEXT) \ - canvas.$(OBJEXT) conditional.$(OBJEXT) dnd.$(OBJEXT) \ - drawshape.$(OBJEXT) endcall.$(OBJEXT) endfor.$(OBJEXT) \ - endhere.$(OBJEXT) eventer.$(OBJEXT) fileio.$(OBJEXT) \ - information.$(OBJEXT) joinblocks.$(OBJEXT) \ + canvas.$(OBJEXT) conditional.$(OBJEXT) death.$(OBJEXT) \ + dnd.$(OBJEXT) drawshape.$(OBJEXT) endcall.$(OBJEXT) \ + endfor.$(OBJEXT) endhere.$(OBJEXT) eventer.$(OBJEXT) \ + fileio.$(OBJEXT) information.$(OBJEXT) joinblocks.$(OBJEXT) \ listpoints.$(OBJEXT) loadnewgraph.$(OBJEXT) makecall.$(OBJEXT) \ python.$(OBJEXT) readfromfile.$(OBJEXT) requestnode.$(OBJEXT) \ senddtmf.$(OBJEXT) shapelist.$(OBJEXT) shapeselect.$(OBJEXT) \ @@ -210,6 +210,7 @@ ../bitmaps/Python.xpm \ ../bitmaps/RequestNode.xpm \ ../bitmaps/compile.xpm \ + ../bitmaps/death.xpm \ ../bitmaps/endcall.xpm \ ../bitmaps/eventer.xpm \ ../bitmaps/makecall.xpm \ @@ -229,6 +230,8 @@ canvas.h \ conditional.cpp \ conditional.h \ + death.cpp \ + death.h \ dnd.cpp \ dnd.h \ drawshape.cpp \ @@ -353,6 +356,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callstartstop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canvas.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conditional.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/death.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawshape.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/endcall.Po@am__quote@ Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Wed Sep 27 21:34:12 2006 @@ -39,6 +39,7 @@ #include "bitmaps/Python.xpm" #include "bitmaps/RequestNode.xpm" #include "bitmaps/compile.xpm" +#include "bitmaps/death.xpm" #include "bitmaps/endcall.xpm" #include "bitmaps/eventer.xpm" #include "bitmaps/makecall.xpm" @@ -71,6 +72,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) @@ -145,6 +147,7 @@ File_menu -> Append ( wxH_FILESAVE__AS, wxT("Save &As"), wxT("")); File_menu -> Append ( wxH_FILEE_XIT, wxT("E&xit"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSCONNECT_OBJECTS, wxT("connect objects"), wxT("")); + Controls_menu -> Append ( wxH_CONTROLSDEATH, wxT("Terminate all procesing "), wxT("")); Controls_menu -> Append ( wxH_CONTROLSENDCALL, wxT("end a call (send hangup)"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSENDHERE, wxT("end here"), wxT("")); Controls_menu -> Append ( wxH_CONTROLSEND_FOR, wxT("end for"), wxT("")); @@ -318,6 +321,7 @@ 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")); @@ -419,6 +423,12 @@ void MyFrame::OnControlspython (wxCommandEvent & WXUNUSED(event)) { imageTypeForPlacing = DndShape::Python; + canvas->SetEditingMode(MyCanvas::PlaceOneShape); +} + +void MyFrame::OnControlsDeath (wxCommandEvent & WXUNUSED(event)) +{ + imageTypeForPlacing = DndShape::Death; canvas->SetEditingMode(MyCanvas::PlaceOneShape); } Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Wed Sep 27 21:34:12 2006 @@ -13,6 +13,7 @@ wxH_FILE = 1, wxH_CONTROLSCOMPILE, wxH_CONTROLSCONNECT_OBJECTS, + wxH_CONTROLSDEATH, wxH_CONTROLSENDCALL, wxH_CONTROLSENDHERE, wxH_CONTROLSEND_FOR, @@ -116,6 +117,11 @@ current graph. This widget will cause the dtmf char string to go to the remote sofaswitch worker. */ void OnControlsSendDtmf (wxCommandEvent & event); + + /**Called in response to a user comand to add a "Death" widget to the + current graph. In other words, send a terminate this control flow now + request */ + void OnControlsDeath (wxCommandEvent & event); /**Called in response to a user comand to add a "End Call" widget to the current graph. In other words, send a hangup message to the remote Modified: sofaswitch/trunk/callflow/src/dnd.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.cpp (original) +++ sofaswitch/trunk/callflow/src/dnd.cpp Wed Sep 27 21:34:12 2006 @@ -384,6 +384,9 @@ if (thisKind == EndCall) return DndShapeEndCall::GetKindName(); + if (thisKind == Death) + return DndShapeDeath::GetKindName(); + if (thisKind == Select) return DndShapeSelect::GetKindName(); @@ -499,6 +502,7 @@ printf("Construct a shape of null\n"); return NULL; case Conditional: return new DndShapeConditional(); + case Death: return new DndShapeDeath(); case EndCall: return new DndShapeEndCall(); case EndFor: return new DndShapeEndFor(); case EndHere: return new DndShapeEndHere(); Modified: sofaswitch/trunk/callflow/src/dnd.h ============================================================================== --- sofaswitch/trunk/callflow/src/dnd.h (original) +++ sofaswitch/trunk/callflow/src/dnd.h Wed Sep 27 21:34:12 2006 @@ -270,7 +270,8 @@ /**17*/ WriteToFile /**Write audio into a .wav file (answering machine specific) */, /**18*/ LoadNewGraph /**Read in an existing graph file (pre compiled) for a new thread of exeuction */, /**19*/ SendDtmf /**Send a dtmf symbol to some sofaswitch worker node */, - /* 20*/ KnownShapes /**Indicates the number of known shapes we can manage */ + /**20*/ Death /**End all processing of this call flow now */, + /* 21*/ KnownShapes /**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 Sep 27 21:34:12 2006 @@ -2,6 +2,7 @@ #define _drawshape_h #include "conditional.h" +#include "death.h" #include "endcall.h" #include "endfor.h" #include "endhere.h"

1 0

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

27 Sep '06

Author: derek Date: Wed Sep 27 19:40:55 2006 New Revision: 136 Modified: sofaswitch/trunk/callflow/bitmaps/endcall.xpm sofaswitch/trunk/callflow/bitmaps/makecall.xpm sofaswitch/trunk/callflow/src/endcall.cpp sofaswitch/trunk/callflow/src/makecall.cpp Log: tidy up graphics. Get EndCall and MakeCall to look right. Modified: sofaswitch/trunk/callflow/bitmaps/endcall.xpm ============================================================================== --- sofaswitch/trunk/callflow/bitmaps/endcall.xpm (original) +++ sofaswitch/trunk/callflow/bitmaps/endcall.xpm Wed Sep 27 19:40:55 2006 @@ -22,18 +22,18 @@ "##ccc##aaba#.aaab##.aab###ccc###", "###.###aaba##.aba#.abbb####cc###", "###.###aaba##a.aa.#aaab#####.###", -"###.###aaba##bb..##bbbb#####.###", -"###.###########..###########.###", -"###.##########.##.##########.###", -"#.#.#.#baaa##.bbb#.baaa###.#.d.#", -"#.#.#.#baaa#.baaa##.aaa###.#.#.#", -".#...#.baba.#bbbb##b.bbdd.d...#.", -"#.#.#.#bbb.##aaab##ba.bddd.d.#.#", -"##...##aa.a##bbbb##bbb.dddd...dd", -"ddd.dddd.dddddddddddddd.dddd.ddd", -"#######.###############d.dddddd#", -"######.bbbb##bbbb##bbbbdd.ddd###", -"#####.#aaab##baab##baabddd.#####", +".##.##.aaba##bb..##bbbb##.##.##.", +"..#.#..########..########..#.#..", +"#.....########.##.########.....#", +"dd...ddbaaa##.bbb#.baaa##dd...dd", +"dd#.dddbaaa#.baaa##.aaa##ddd.ddd", +"dddddddbaba.#bbbb##b.bb##ddddddd", +"#ddddd#bbb.##aaab##ba.b###dddddd", +"##ddd##aa.a##bbbb##bbb.####dddd#", +"###d####.##############.####dd##", +"#######.################.#######", +"######.bbbb##bbbb##bbbb##.######", +"#####.#aaab##baab##baab###.#####", "####.##aaba##bbbb##bbbb####.####", "###.###aaba##baab##aabb#####.###", "##.####abaa##bbbb##aaba######.##", Modified: sofaswitch/trunk/callflow/bitmaps/makecall.xpm ============================================================================== --- sofaswitch/trunk/callflow/bitmaps/makecall.xpm (original) +++ sofaswitch/trunk/callflow/bitmaps/makecall.xpm Wed Sep 27 19:40:55 2006 @@ -1,12 +1,11 @@ /* XPM */ static char *makecall[]={ -"32 32 6 1", +"32 32 5 1", +"c c None", ". c None", "# c #000000", "b c #00c0c0", "a c #585858", -"c c #c00000", -"d c #ff0000", "................................", "................###.............", "..............##a.a##...........", @@ -24,16 +23,16 @@ ".......##a#..#a##..###a.........", ".......##a#..aaaa..aaaa.........", "................................", -"................................", -".......a###..aaaa..a###.........", -".......a###..a###..a###.........", -".......a#a#..aaaa..aaaaccc......", -".......aaaa..###a..a##addddd....", -".......##a#..aaaa..aaaaccccccdd.", -"dddddddddddddddddddddddddddddddd", -".......................ccccccdd.", -".......aaaa..aaaa..aaaaddddd....", -".......###a..a##a..a##accc......", +".c..............................", +".cc#.c.a###..aaaa..a###.....#...", +".c###c.a###..a###..a###..c.###..", +".#####.a#a#..aaaa..aaaaccc#####.", +"##.#.##aaaa..###a..a##acc##c#c##", +"#..#..###a#..aaaa..aaaacc#cc#cc#", +"ccc#cccccccccccccccccccccccc#ccc", +"..c#c.................cccccc#cc.", +"...#...aaaa..aaaa..aaaaccccc#c..", +"...#...###a..a##a..a##accc..#...", ".......##a#..aaaa..aaaa.........", ".......##a#..a##a..##aa.........", ".......#a##..aaaa..##a#.........", Modified: sofaswitch/trunk/callflow/src/endcall.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/endcall.cpp (original) +++ sofaswitch/trunk/callflow/src/endcall.cpp Wed Sep 27 19:40:55 2006 @@ -29,4 +29,30 @@ void DndShapeEndCall::Draw(wxDC & dc) { DndShapeCallStartStop::Draw(dc); + + dc.SetPen(*wxRED_PEN); + dc.SetBrush(wxBrush(*wxRED, wxTRANSPARENT)); + + wxPoint p1(m_rect.GetPosition()); + wxPoint pM(p1.x + 25, p1.y + 25); + wxPoint tm(p1.x + 25, p1.y + 10); + wxPoint bl(p1.x + 13, p1.y + 35); + wxPoint br(p1.x + 37, p1.y + 35); + dc.DrawLine(tm, pM); + dc.DrawLine(br, pM); + dc.DrawLine(bl, pM); + dc.DrawCircle(pM, 20); + + dc.SetPen(*wxBLACK_PEN); + + wxPoint ta(p1.x + 10, p1.y + 10); + wxPoint tb(p1.x + 40, p1.y + 10); + wxPoint tc(p1.x + 10, p1.y + 40); + wxPoint td(p1.x + 40, p1.y + 40); + + dc.DrawLine(ta, tc); + dc.DrawLine(tb, td); + + DrawArrow(dc, tc, ArrowDown, Loose); + DrawArrow(dc, td, ArrowDown, Loose); } Modified: sofaswitch/trunk/callflow/src/makecall.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/makecall.cpp (original) +++ sofaswitch/trunk/callflow/src/makecall.cpp Wed Sep 27 19:40:55 2006 @@ -30,6 +30,19 @@ void DndShapeMakeCall::Draw(wxDC & dc) { - DndShapeCallStartStop::Draw(dc); + + dc.SetPen(*wxBLACK_PEN); + wxPoint p1(m_rect.GetPosition()); + + wxPoint ta(p1.x + 10, p1.y + 10); + wxPoint tb(p1.x + 40, p1.y + 10); + wxPoint tc(p1.x + 10, p1.y + 40); + wxPoint td(p1.x + 40, p1.y + 40); + + dc.DrawLine(ta, tc); + dc.DrawLine(tb, td); + + DrawArrow(dc, tb, ArrowUp, Loose); + DrawArrow(dc, ta, ArrowUp, Loose); }

1 0