Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3 commits
  • 3 files changed
  • 0 comments
  • 1 contributor
Jan 16, 2012
Patrick Plenefisch Fixing small ZomB menu size
git-svn-id: http://firstforge.wpi.edu/svn/repos/zomb/trunk@491 0141d0df-edca-4edd-a601-3402401f7f08
1ae600e
Jan 17, 2012
Patrick Plenefisch Fixing a few csv bugs, now more reliable
git-svn-id: http://firstforge.wpi.edu/svn/repos/zomb/trunk@492 0141d0df-edca-4edd-a601-3402401f7f08
746413f
Jan 19, 2012
Patrick Plenefisch Pulling up version
git-svn-id: http://firstforge.wpi.edu/svn/repos/zomb/trunk@493 0141d0df-edca-4edd-a601-3402401f7f08
9c74c38
14  Apps/VisualZomB/Designer.xaml
@@ -147,7 +147,7 @@
147 147
         </ScrollViewer>
148 148
         <Canvas>
149 149
             <Grid Canvas.Top="-1" Name="MenuGrid" Width="{Binding Path=ActualWidth, ElementName=ViZGrid}" >
150  
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" SnapsToDevicePixels="True">
  150
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" SnapsToDevicePixels="True" Height="24">
151 151
                     <StackPanel.Background>
152 152
                         <DrawingBrush>
153 153
                             <DrawingBrush.Drawing>
@@ -175,19 +175,19 @@
175 175
                     <Menu Margin="1,0,0,0" Background="Transparent" Foreground="Black" ToolTip="VisualZomB Menu" ToolTipService.InitialShowDelay="1000">
176 176
                         <MenuItem Name="MMenu" >
177 177
                             <MenuItem.Header>
178  
-                                <Border Background="{Binding Path=Background, ElementName=MMenu}">
  178
+                                <Border Background="{Binding Path=Background, ElementName=MMenu}" Height="23">
179 179
                                     <Border.Clip>
180 180
                                         <PathGeometry >
181 181
                                             <PathFigure StartPoint="0,0" IsClosed="True">
182  
-                                                <BezierSegment Point1="0,10" Point2="0,20" Point3="24,20" />
183  
-                                                <LineSegment Point="55,20" />
  182
+                                                <BezierSegment Point1="0,10" Point2="0,23" Point3="24,23" />
  183
+                                                <LineSegment Point="55,23" />
184 184
                                                 <LineSegment Point="55,0"/>
185 185
                                             </PathFigure>
186 186
                                         </PathGeometry>
187 187
                                     </Border.Clip>
188  
-                                    <StackPanel Orientation="Horizontal" Margin="8,2,3,4">
  188
+                                    <StackPanel Orientation="Horizontal" Margin="8,4,3,4">
189 189
                                         <TextBlock Text="ZomB" FontFamily="Verdana" FontSize="12" VerticalAlignment="Center" Foreground="Black" Height="13" Width="35" />
190  
-                                        <Image Margin="3,0,0,0">
  190
+                                        <Image Margin="3,0,0,0" Height="7">
191 191
                                             <Image.Source>
192 192
                                                 <DrawingImage>
193 193
                                                     <DrawingImage.Drawing>
@@ -277,7 +277,7 @@
277 277
                             </DrawingBrush>
278 278
                         </Rectangle.Fill>
279 279
                     </Rectangle>
280  
-                    <Button Name="BBtn" Click="Button_Click" Background="Transparent" ToolTip="Close" ToolTipService.InitialShowDelay="1000">
  280
+                    <Button Name="BBtn" Click="Button_Click" Background="Transparent" Height="18" ToolTip="Close" ToolTipService.InitialShowDelay="1000">
281 281
                         <Button.Content>
282 282
                             <Border Background="Transparent">
283 283
                                 <Border.Clip>
17  ZomBdll/NetAndDataProcessing/DashboardData/CsvDataMonitor.cs
... ...
@@ -1,6 +1,6 @@
1 1
 /*
2 2
  * ZomB Dashboard System <http://firstforge.wpi.edu/sf/projects/zombdashboard>
3  
- * Copyright (C) 2009-2010, Patrick Plenefisch and FIRST Robotics Team 451 "The Cat Attack"
  3
+ * Copyright (C) 2012, Patrick Plenefisch and FIRST Robotics Team 451 "The Cat Attack"
4 4
  * 
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by
@@ -161,18 +161,19 @@ private void WriteBuffer()
161 161
             {
162 162
                 try
163 163
                 {
164  
-                    foreach (var item in header)
  164
+                    outs = new StreamWriter(FilePath, true);
  165
+                    for (; qindx < header.Count; qindx++)
165 166
                     {
166  
-                        outs.Write(item + ",");
  167
+                        outs.Write(header[qindx] + ",");
167 168
                     }
168  
-                    outs.WriteLine();
  169
+                    System.Diagnostics.Debug.WriteLine(qindx);
169 170
                     for (int i = 0; i < dataq.Count - 1; i++)
170 171
                     {
  172
+                        outs.WriteLine();
171 173
                         foreach (var item in dataq[i])
172 174
                         {
173 175
                             outs.Write((item ?? "") + ",");
174 176
                         }
175  
-                        outs.WriteLine();
176 177
                     }
177 178
 
178 179
                     //save last for next merge
@@ -180,6 +181,9 @@ private void WriteBuffer()
180 181
                     dataq.Clear();
181 182
                     dataq.Add(last);
182 183
                     savetime = GetTime();
  184
+                    outs.Flush();
  185
+                    outs.Close();
  186
+                    outs = null;
183 187
                 }
184 188
                 catch { }
185 189
             }
@@ -192,10 +196,10 @@ public void Start()
192 196
         {
193 197
             if (!Running)
194 198
             {
195  
-                outs = new StreamWriter(FilePath, true);
196 199
                 saving = true;
197 200
                 starttime = DateTime.Now;
198 201
                 lasttime = savetime = 0;
  202
+                qindx = 0;
199 203
             }
200 204
         }
201 205
 
@@ -209,6 +213,7 @@ public void Stop()
209 213
                 saving = false;
210 214
                 WriteBuffer();
211 215
                 WriteOff();
  216
+                qindx = 0;
212 217
             }
213 218
         }
214 219
 
2  ZomBdll/ZVersionMgr.cs
@@ -31,6 +31,6 @@ public static class ZVersionMgr
31 31
          */
32 32
 
33 33
         public const string CodeName = "Snowdrift";
34  
-        public const string ReleaseDateString = "Beta 2 Released 1/11/12";
  34
+        public const string ReleaseDateString = "Released 1/18/12";
35 35
     }
36 36
 }

No commit comments for this range

Something went wrong with that request. Please try again.