commit 506d0ab21bf465092b80a0975f5e94f6015dc023
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 29 19:18:10 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 29 19:18:10 2013 -0700
tree 5f8444317a59cea35ad82ac941bbf82cda9a0389
parent 0c9ab7ce34efda4c289879948e67610819abde50

Connecting extracted values of sent/recv Interest/Data with status window

Change-Id: I3d182984776371e97a39ec8edcbb3b335f2a9f55

osx/menu-delegate.mm

diff --git a/osx/menu-delegate.mm b/osx/menu-delegate.mm
index eac903b..6b6c75e 100644
--- a/osx/menu-delegate.mm
+++ b/osx/menu-delegate.mm
@@ -13,12 +13,22 @@
 
 @implementation MenuDelegate
 
+@synthesize interestSent;
+@synthesize interestRecv;
+@synthesize dataSent;
+@synthesize dataRecv;
+
 -(id)init
 {
   if (![super init]) {
     return nil;
   }
 
+  interestSent = @"N/A";
+  interestRecv = @"N/A";
+  dataSent = @"N/A";
+  dataRecv = @"N/A";
+  
   m_autoconfInProgress = false;
   m_operationQueue = [[NSOperationQueue alloc] init];
   return self;
@@ -173,9 +183,14 @@
   NSXMLDocument *statusFibXml = [document objectByApplyingXSLT:m_statusToFibXslt
                                  arguments:nil
                                  error:nil];
-
-  m_statusString = [[NSAttributedString alloc]initWithHTML:[statusXml XMLData] documentAttributes:NULL];
-  [daemonStatusHtml setAttributedStringValue:m_statusString];
+  
+  NSXMLNode *element = [[statusXml rootElement] childAtIndex:0]; //data
+  [self setDataRecv:[[element childAtIndex:0] stringValue]];
+  [self setDataSent:[[element childAtIndex:1] stringValue]];
+  
+  element = [[statusXml rootElement] childAtIndex:1]; //interests
+  [self setInterestRecv:[[element childAtIndex:0] stringValue]];
+  [self setInterestSent:[[element childAtIndex:1] stringValue]];
 
   [preferencesDelegate updateFibStatus:statusFibXml];
 
@@ -199,7 +214,11 @@
     [statusItem setImage:m_disconnectedIcon];
   }
 
-  [daemonStatusHtml setStringValue:@""];
+  [self setInterestSent:@"N/A"];
+  [self setInterestRecv:@"N/A"];
+  [self setDataSent:@"N/A"];
+  [self setDataRecv:@"N/A"];
+
   [preferencesDelegate updateFibStatus:nil];
 
   m_autoconfInProgress = true;