Connecting extracted values of sent/recv Interest/Data with status window
Change-Id: I3d182984776371e97a39ec8edcbb3b335f2a9f55
diff --git a/osx/MainMenu.xib b/osx/MainMenu.xib
index 8c18853..1f3ab9b 100644
--- a/osx/MainMenu.xib
+++ b/osx/MainMenu.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -20,10 +20,8 @@
<outlet property="daemonStatusHtml" destination="3Ah-G1-XHY" id="dSt-SZ-GY8"/>
<outlet property="daemonStatusHtmlView" destination="pEE-BK-JGJ" id="bPo-et-95L"/>
<outlet property="daemonStatusView" destination="NBE-Gf-zLc" id="vpG-7z-Wdp"/>
- <outlet property="dataSentRecv" destination="4e0-ZL-CIw" id="vNx-Ab-CHZ"/>
<outlet property="forwardingSettingsView" destination="lQz-E7-PRx" id="8MT-1G-PZi"/>
<outlet property="generalSettingsView" destination="A7D-GN-X5W" id="Apc-XD-aOH"/>
- <outlet property="interestSentRecv" destination="Ryr-5l-j6E" id="APS-Fe-ayk"/>
<outlet property="ndnPreferences" destination="c5x-Oa-5tb" id="5qP-ZT-G5y"/>
<outlet property="preferencesDelegate" destination="0yn-TQ-4SC" id="OUx-zN-9bt"/>
<outlet property="preferencesPanel" destination="coQ-VU-5RU" id="Jb0-qB-W2K"/>
@@ -91,7 +89,7 @@
<rect key="frame" x="0.0" y="0.0" width="400" height="200"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3Ah-G1-XHY">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3Ah-G1-XHY">
<rect key="frame" x="-3" y="0.0" width="406" height="200"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<constraints>
@@ -113,55 +111,114 @@
</constraints>
</customView>
<customView id="NBE-Gf-zLc">
- <rect key="frame" x="0.0" y="0.0" width="193" height="67"/>
+ <rect key="frame" x="0.0" y="0.0" width="204" height="77"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T4F-W2-p5Y">
- <rect key="frame" x="3" y="24" width="63" height="18"/>
+ <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2AD-hZ-6K7">
+ <rect key="frame" x="9" y="-1" width="187" height="76"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Interests" id="3iV-EO-iJG">
- <font key="font" size="14" name="LucidaGrande"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GG0-EG-paT">
- <rect key="frame" x="3" y="3" width="36" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Data" id="rfg-ho-nUP">
- <font key="font" size="14" name="LucidaGrande"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="saw-m1-FXa">
- <rect key="frame" x="70" y="45" width="125" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title=" Sent / Recv" id="lAv-EF-k8S">
- <font key="font" size="14" name="LucidaGrande"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ryr-5l-j6E">
- <rect key="frame" x="70" y="24" width="125" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0 / 0" id="YpI-NB-6cc">
- <font key="font" size="14" name="LucidaGrande"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4e0-ZL-CIw">
- <rect key="frame" x="70" y="3" width="125" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0 / 0" id="iWE-0h-6gy">
- <font key="font" size="14" name="LucidaGrande"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ <view key="contentView">
+ <rect key="frame" x="1" y="1" width="185" height="74"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T4F-W2-p5Y">
+ <rect key="frame" x="7" y="33" width="63" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Interests" id="3iV-EO-iJG">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GG0-EG-paT">
+ <rect key="frame" x="7" y="12" width="36" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Data" id="rfg-ho-nUP">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ryr-5l-j6E">
+ <rect key="frame" x="70" y="33" width="47" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0" id="YpI-NB-6cc">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="494" name="value" keyPath="interestSent" id="PJJ-on-B0m"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GZr-jD-iDD">
+ <rect key="frame" x="70" y="54" width="47" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Sent" id="omb-PN-Lwh">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dAF-UO-iup">
+ <rect key="frame" x="123" y="54" width="47" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Recv" id="9pk-UW-wh4">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6ky-d3-OAS">
+ <rect key="frame" x="123" y="34" width="47" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0" id="tCW-ov-hmL">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="494" name="value" keyPath="interestRecv" id="Uqh-Ll-cWP"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rL9-hH-BE0">
+ <rect key="frame" x="123" y="12" width="47" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0" id="pkN-Q8-ilx">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="494" name="value" keyPath="dataRecv" id="LXi-ym-WNq"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4e0-ZL-CIw">
+ <rect key="frame" x="70" y="12" width="47" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="0" id="iWE-0h-6gy">
+ <font key="font" size="14" name="LucidaGrande"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="494" name="value" keyPath="dataSent" id="0i4-1J-GeM"/>
+ </connections>
+ </textField>
+ </subviews>
+ </view>
+ <constraints>
+ <constraint firstAttribute="width" constant="181" id="FLe-vy-fI5"/>
+ <constraint firstAttribute="height" constant="70" id="SJR-Nb-wEh"/>
+ </constraints>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
</subviews>
+ <constraints>
+ <constraint firstItem="2AD-hZ-6K7" firstAttribute="top" secondItem="NBE-Gf-zLc" secondAttribute="top" constant="4" id="9K3-ZX-6ax"/>
+ <constraint firstItem="2AD-hZ-6K7" firstAttribute="leading" secondItem="NBE-Gf-zLc" secondAttribute="leading" constant="12" id="gUF-Yq-M5C"/>
+ </constraints>
</customView>
<customView id="24d-37-bzd" customClass="TightMenuItemView">
<rect key="frame" x="0.0" y="0.0" width="195" height="20"/>
@@ -321,7 +378,7 @@
<action selector="openTrafficMapPage:" target="0yn-TQ-4SC" id="62g-PA-oMS"/>
</connections>
</button>
- <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1EJ-ak-3K9">
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1EJ-ak-3K9">
<rect key="frame" x="12" y="16" width="178" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="inline" title="Open Testbed Routing Status" bezelStyle="inline" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ca1-IW-7he">
@@ -358,7 +415,7 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="253"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8C0-3r-hw7">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8C0-3r-hw7">
<rect key="frame" x="17" y="210" width="446" height="33"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<constraints>
@@ -431,11 +488,11 @@
</subviews>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="l9T-JI-kUJ">
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="l9T-JI-kUJ">
<rect key="frame" x="-100" y="-100" width="438" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Ohc-CY-k3U">
+ <scroller key="verticalScroller" verticalHuggingPriority="750" id="Ohc-CY-k3U">
<rect key="frame" x="423" y="17" width="16" height="131"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -489,15 +546,15 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="142"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <box autoresizesSubviews="NO" ambiguous="YES" misplaced="YES" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="AjO-Oq-adZ">
+ <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="AjO-Oq-adZ">
<rect key="frame" x="17" y="51" width="446" height="73"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView">
<rect key="frame" x="1" y="1" width="444" height="71"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QOB-7K-MZh">
- <rect key="frame" x="12" y="27" width="142" height="17"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QOB-7K-MZh">
+ <rect key="frame" x="11" y="42" width="141" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="inline" title="Obtain NDN Certificate" bezelStyle="inline" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ojj-gd-p4g">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -511,14 +568,18 @@
</view>
<constraints>
<constraint firstAttribute="height" constant="67" id="8oL-hp-hZT"/>
- <constraint firstItem="QOB-7K-MZh" firstAttribute="leading" secondItem="AjO-Oq-adZ" secondAttribute="leading" constant="10" id="9fH-IV-tqE"/>
- <constraint firstItem="QOB-7K-MZh" firstAttribute="top" secondItem="AjO-Oq-adZ" secondAttribute="top" constant="13" id="JGN-Ek-9g7"/>
+ <constraint firstItem="QOB-7K-MZh" firstAttribute="leading" secondItem="AjO-Oq-adZ" secondAttribute="leading" constant="9" id="9Pt-fi-j4Z"/>
+ <constraint firstItem="QOB-7K-MZh" firstAttribute="top" secondItem="AjO-Oq-adZ" secondAttribute="top" constant="11" id="IY7-z1-3s3"/>
<constraint firstAttribute="width" constant="440" id="Y1O-uV-s8j"/>
</constraints>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
</subviews>
+ <constraints>
+ <constraint firstItem="AjO-Oq-adZ" firstAttribute="leading" secondItem="o3g-Q4-BEo" secondAttribute="leading" constant="20" id="ADz-h3-CRa"/>
+ <constraint firstItem="AjO-Oq-adZ" firstAttribute="top" secondItem="o3g-Q4-BEo" secondAttribute="top" constant="20" id="aUm-g8-ue7"/>
+ </constraints>
</customView>
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="tRY-ba-DfO" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES"/>
@@ -625,6 +686,16 @@
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
</view>
+ <box autoresizesSubviews="NO" title="Box" borderType="line" id="jsz-vR-zSx">
+ <rect key="frame" x="0.0" y="0.0" width="177" height="114"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="1" y="1" width="175" height="98"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
</objects>
<resources>
<image name="NSAdvanced" width="32" height="32"/>
diff --git a/osx/Resources/status.xslt b/osx/Resources/status.xslt
index 4625a82..d64ea59 100644
--- a/osx/Resources/status.xslt
+++ b/osx/Resources/status.xslt
@@ -1,28 +1,20 @@
<xsl:stylesheet version = '1.0'
xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
-<xsl:template match="/ndnd">
-<html><body>
-<xsl:apply-templates select="forwarding/fentry" />
-</body></html>
+<xsl:template match="/">
+<stats>
+ <data>
+ <in><xsl:value-of select="sum(/ndnd/faces/face/meters/datain/total)" /></in>
+ <out><xsl:value-of select="sum(/ndnd/faces/face/meters/dataout/total)" /></out>
+ <!-- <in><xsl:value-of select="sum(/ndnd/faces/face/meters/datain/persec)" /></in> -->
+ <!-- <out><xsl:value-of select="sum(/ndnd/faces/face/meters/dataout/persec)" /></out> -->
+ </data>
+ <interests>
+ <in><xsl:value-of select="sum(/ndnd/faces/face/meters/intrin/total)" /></in>
+ <out><xsl:value-of select="sum(/ndnd/faces/face/meters/introut/total)" /></out>
+ <!-- <in><xsl:value-of select="sum(/ndnd/faces/face/meters/intrin/persec)" /></in> -->
+ <!-- <out><xsl:value-of select="sum(/ndnd/faces/face/meters/introut/persec)" /></out> -->
+ </interests>
+</stats>
</xsl:template>
-
-<xsl:template match="fentry">
-<xsl:apply-templates select="dest/faceid" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="prefix"/>
-<br/>
-</xsl:template>
-
-<xsl:template match="faceid">
-<xsl:variable name="id"><xsl:value-of select="." /></xsl:variable>
-<b>face: <xsl:copy-of select="$id" />
-
-<xsl:choose>
- <xsl:when test="count(//face/ip[../faceid=$id]) > 0"> (<xsl:value-of select="//face/ip[../faceid=$id]" />)
- </xsl:when>
- <xsl:otherwise> (app)</xsl:otherwise>
-</xsl:choose></b>
-</xsl:template>
-
</xsl:stylesheet>
diff --git a/osx/menu-delegate.h b/osx/menu-delegate.h
index 4520f8a..dc736a6 100644
--- a/osx/menu-delegate.h
+++ b/osx/menu-delegate.h
@@ -38,9 +38,6 @@
IBOutlet NSTextField *dataSentRecv;
IBOutlet NSView *daemonStatusView;
- IBOutlet NSTextField *daemonStatusHtml;
- IBOutlet NSView *daemonStatusHtmlView;
- NSAttributedString *m_statusString;
TightMenuItemView *connectionStatusView;
@@ -50,6 +47,11 @@
bool m_autoconfInProgress;
}
+@property (nonatomic, readwrite) NSString *interestSent;
+@property (nonatomic, readwrite) NSString *interestRecv;
+@property (nonatomic, readwrite) NSString *dataSent;
+@property (nonatomic, readwrite) NSString *dataRecv;
+
-(IBAction)openDaemonStatus:(id)sender;
-(IBAction)showExitConfirmationWindow:(id)sender;
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;
diff --git a/wscript b/wscript
index ebcf01e..3ac16cc 100644
--- a/wscript
+++ b/wscript
@@ -9,8 +9,8 @@
opt.load('sparkle xcode', tooldir='waf-tools')
grp = opt.add_option_group ('NDNx Control Center options')
- grp.add_option ('--ndnx', help='''Root path to NDNx installation (default: /usr)''',
- dest='ndnx_root', type=str, default='/usr')
+ grp.add_option ('--ndnx', help='''Root path to NDNx installation (default: /usr/local/ndn)''',
+ dest='ndnx_root', type=str, default='/usr/local/ndn')
def configure(conf):
conf.load('compiler_c compiler_cxx')
@@ -21,7 +21,7 @@
conf.start_msg('Checking for NDNx in %s' % conf.options.ndnx_root)
if not conf.find_file('ndnd ndndstatus ndndstart ndndstop', path_list='%s/bin' % conf.options.ndnx_root, mandatory=False):
- conf.end_msg ('not found, but will proceed anyways', 'YELLOW')
+ conf.fatal ('not found', 'RED')
else:
conf.end_msg ('ok')
@@ -40,10 +40,10 @@
conf.check_cxx(framework_name='Cocoa', uselib_store='COCOA', compile_filename='test.mm')
conf.env.ARCH_OSX = 'x86_64'
- conf.env.CXXFLAGS_OSX += ['-fobjc-arc', '-mmacosx-version-min=10.8']
- conf.env.LINKFLAGS_OSX += ['-mmacosx-version-min=10.8']
+ conf.env.CXXFLAGS_OSX += ['-fobjc-arc', '-mmacosx-version-min=10.7']
+ conf.env.LINKFLAGS_OSX += ['-mmacosx-version-min=10.7']
- conf.env.MACOSX_DEPLOYMENT_TARGET = '10.8'
+ conf.env.MACOSX_DEPLOYMENT_TARGET = '10.7'
conf.load('sparkle')