CA - WIP - SAVEPOINT - NOT INTEGRATED WITH VECTO YET

git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1844

VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb

@@ -301,37 +301,49 @@ End Function
  Public Overrides Function ToString() As String
 
   Dim sb As New StringBuilder()
+  Dim a1,a2,a3,e1,e2,e3 As String
 
 
   For Each alt As Alternator In Alternators
     sb.AppendLine("")
-    sb.AppendFormat("ALTERNATOR {0}, PulleyRatio {1}",alt.AlternatorName,alt.PulleyRatio)
+    sb.AppendFormat("** {0} ** , PulleyRatio {1}",alt.AlternatorName,alt.PulleyRatio)
     sb.AppendLine("")
     sb.AppendLine  ("******************************************************************")
     sb.AppendLine("")
 
-
-    sb.AppendLine("TABLE 1 (2000rpm)")
+    Dim i As Integer=1
+    sb.AppendLine("Table 1 (2000)" + vbTab + "Table 2 (4000)" + vbTab + "Table 3 (6000)")
+    sb.AppendLine("Amps" + vbTab + "Eff" + vbTab + "Amps" + vbTab + "Eff" + vbTab + "Amps" + vbTab + "Eff" + vbTab )
     sb.AppendLine("")
-    sb.AppendLine("RPM" + vbTab + "Efficiency")
-    For Each Row as AltUserInput In alt.InputTable2000  
-       sb.AppendLine(Row.Amps.ToString() + vbTab + Row.Eff.ToString())
+    For  i = 0 to 5 
+
+    a1= alt.InputTable2000(i).Amps.ToString("0.###")
+    e1 =alt.InputTable2000(i).Eff .ToString("0.###")
+    a2= alt.InputTable4000(i).Amps.ToString("0.###")
+    e2 =alt.InputTable4000(i).Eff .ToString("0.###")
+    a3= alt.InputTable6000(i).Amps.ToString("0.###")
+    e3 =alt.InputTable6000(i).Eff .ToString("0.###")
+    sb.AppendLine(a1 + vbTab + e1 + vbTab + a2 + vbTab + e2 + vbTab + a3 + vbTab + e3 + vbTab )
+
     Next
-     sb.AppendLine("")
 
-    sb.AppendLine("TABLE 2 (4000rpm)")
-    sb.AppendLine("")
-    sb.AppendLine("RPM" + vbTab + "Efficiency")
-    For Each Row as AltUserInput In alt.InputTable4000  
-       sb.AppendLine(Row.Amps.ToString() + vbTab + Row.Eff.ToString())
+
   Next
-    sb.AppendLine("")
 
-    sb.AppendLine("TABLE 2 (6000rpm)")
     sb.AppendLine("")
-    sb.AppendLine("RPM" + vbTab + "Efficiency")
-    For Each Row as AltUserInput In alt.InputTable6000  
-       sb.AppendLine(Row.Amps.ToString() + vbTab + Row.Eff.ToString())
+    sb.AppendLine("********* COMBINED EFFICIENCY VALUES **************")
+    sb.AppendLine("")
+    sb.AppendLine( vbTab +"RPM VALUES")
+    sb.AppendLine("AMPS" + vbTab + "500" + vbTab + "1500" + vbtab + "2500" + vbtab + "3500" + vbtab + "4500" + vbtab + "5500" + vbtab + "6500" + vbTab  + "7500")
+    For a As Single = 1 to alternators.Count * 50
+
+       sb.Append(a.ToString("0") + vbTab)
+       For Each  r As Single in {500,1500,2500,3500,4500,5500,6500,7500}
+        
+          Dim eff as Single = GetEfficiency( r ,a).Efficiency
+          
+          sb.Append( eff.ToString("0.###") + vbTab)
+          
        Next
        sb.AppendLine("")
 

VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.Designer.vb

@@ -63,10 +63,10 @@ Partial Class frmCombinedAlternators
         Me.Label17 = New System.Windows.Forms.Label()
         Me.txtIndex = New System.Windows.Forms.TextBox()
         Me.tabDiagnostics = New System.Windows.Forms.TabPage()
+        Me.txtDiagnostics = New System.Windows.Forms.TextBox()
         Me.btnSave = New System.Windows.Forms.Button()
         Me.btnCancel = New System.Windows.Forms.Button()
         Me.ErrorProvider1 = New System.Windows.Forms.ErrorProvider(Me.components)
-        Me.txtDiagnostics = New System.Windows.Forms.TextBox()
         Me.grpTable2000PRM.SuspendLayout
         Me.grpTable4000PRM.SuspendLayout
         Me.grpTable6000PRM.SuspendLayout
@@ -377,10 +377,10 @@ Partial Class frmCombinedAlternators
         '
         Me.TabControl1.Controls.Add(Me.tabInputs)
         Me.TabControl1.Controls.Add(Me.tabDiagnostics)
-        Me.TabControl1.Location = New System.Drawing.Point(42, 29)
+        Me.TabControl1.Location = New System.Drawing.Point(42, 12)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(700, 477)
+        Me.TabControl1.Size = New System.Drawing.Size(700, 494)
         Me.TabControl1.TabIndex = 33
         '
         'tabInputs
@@ -482,11 +482,22 @@ Partial Class frmCombinedAlternators
         Me.tabDiagnostics.Location = New System.Drawing.Point(4, 22)
         Me.tabDiagnostics.Name = "tabDiagnostics"
         Me.tabDiagnostics.Padding = New System.Windows.Forms.Padding(3)
-        Me.tabDiagnostics.Size = New System.Drawing.Size(692, 451)
+        Me.tabDiagnostics.Size = New System.Drawing.Size(692, 468)
         Me.tabDiagnostics.TabIndex = 1
         Me.tabDiagnostics.Text = " Diagnostics"
         Me.tabDiagnostics.UseVisualStyleBackColor = true
         '
+        'txtDiagnostics
+        '
+        Me.txtDiagnostics.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.txtDiagnostics.Location = New System.Drawing.Point(23, 16)
+        Me.txtDiagnostics.Margin = New System.Windows.Forms.Padding(0, 0, 0, 0)
+        Me.txtDiagnostics.Multiline = true
+        Me.txtDiagnostics.Name = "txtDiagnostics"
+        Me.txtDiagnostics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+        Me.txtDiagnostics.Size = New System.Drawing.Size(648, 429)
+        Me.txtDiagnostics.TabIndex = 0
+        '
         'btnSave
         '
         Me.btnSave.Location = New System.Drawing.Point(550, 523)
@@ -509,15 +520,6 @@ Partial Class frmCombinedAlternators
         '
         Me.ErrorProvider1.ContainerControl = Me
         '
-        'txtDiagnostics
-        '
-        Me.txtDiagnostics.Location = New System.Drawing.Point(23, 16)
-        Me.txtDiagnostics.Multiline = true
-        Me.txtDiagnostics.Name = "txtDiagnostics"
-        Me.txtDiagnostics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.txtDiagnostics.Size = New System.Drawing.Size(648, 429)
-        Me.txtDiagnostics.TabIndex = 0
-        '
         'frmCombinedAlternators
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)

VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.resx

@@ -120,4 +120,7 @@
   <metadata name="ErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>26</value>
+  </metadata>
 </root>
\ No newline at end of file