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); }