support for annotations included

Bug found by:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

diff --git a/imunes.tcl b/imunes.tcl
index 1ceb0ab76ddc8a82ed87c09166eab932e93c0bba..0ca915ff92586a92dcc65583cfd77acec0e3d999 100755 (executable)
--- a/imunes.tcl
+++ b/imunes.tcl
@@ -1,4 +1,4 @@
-# $Id: imunes.tcl,v 1.19.2.1 2007/05/07 08:20:09 ana Exp $ 
+# $Id: imunes.tcl,v 1.19.2.2 2007/07/11 12:21:08 miljenko Exp $ 
 #
 # Copyright 2004, 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -104,6 +104,8 @@ source "$ROOTDIR/$LIBDIR/lanswitch.tcl"
 source "$ROOTDIR/$LIBDIR/rj45.tcl"
 
 source "$ROOTDIR/$LIBDIR/editor.tcl"
+source "$ROOTDIR/$LIBDIR/annotations.tcl"
+
 source "$ROOTDIR/$LIBDIR/help.tcl"
 source "$ROOTDIR/$LIBDIR/filemgmt.tcl"
 
@@ -157,6 +159,9 @@ source "$ROOTDIR/$LIBDIR/ns2imunes.tcl"
 set node_list {}
 set link_list {}
 set canvas_list {}
+set oval_list {}
+set rectangle_list {}
+set text_list {}
 set prefs {}
 set eid e0
 

diff --git a/install.sh b/install.sh
index 93adb43e0374d970839c410fb62130a6e41b17ce..1d99441efdf6be7979608164da380d1d7fb413a5 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -26,12 +26,13 @@ lib_files="nodecfg.tcl linkcfg.tcl cfgparse.tcl ipv4.tcl ipv6.tcl exec.tcl \
           canvas.tcl editor.tcl filemgmt.tcl help.tcl initgui.tcl \
           quagga.tcl xorp.tcl static.tcl pc.tcl host.tcl \
           lanswitch.tcl rj45.tcl hub.tcl ns2imunes.tcl ipsec.tcl \
-          topogen.tcl"
+          topogen.tcl annotations.tcl"
 
-tiny_icons="delete.gif hub.gif frswitch.gif host.gif \
-           lanswitch.gif link.gif pc.gif rj45.gif router.gif select.gif"
+tiny_icons="oval.gif delete.gif frswitch.gif host.gif hub.gif \
+           lanswitch.gif link.gif pc.gif rectangle.gif rj45.gif \
+            router.gif select.gif text.gif"
 
-normal_icons="hub.gif frswitch.gif host.gif lanswitch.gif pc.gif \
+normal_icons="frswitch.gif host.gif hub.gif lanswitch.gif pc.gif \
              rj45.gif router.gif"