support of mission type recognition, the most of mission types

jarig · Jan 25, 2016 · b18f0aa · b18f0aa
1 parent 79c5b04
commit b18f0aa
Show file tree

Hide file tree

Showing 22 changed files with 139 additions and 29 deletions.
diff --git a/EliteReporter/Assets/mTypes/Assassination.bmp b/EliteReporter/Assets/mTypes/Assassination.bmp
diff --git a/EliteReporter/Assets/mTypes/BountyKill.bmp b/EliteReporter/Assets/mTypes/BountyKill.bmp
diff --git a/EliteReporter/Assets/mTypes/CargoTransfer.bmp b/EliteReporter/Assets/mTypes/CargoTransfer.bmp
diff --git a/EliteReporter/Assets/mTypes/CourierDelivery.bmp b/EliteReporter/Assets/mTypes/CourierDelivery.bmp
diff --git a/EliteReporter/Assets/mTypes/DataDelivery.bmp b/EliteReporter/Assets/mTypes/DataDelivery.bmp
diff --git a/EliteReporter/Assets/mTypes/FindAndDeliver.bmp b/EliteReporter/Assets/mTypes/FindAndDeliver.bmp
diff --git a/EliteReporter/Assets/mTypes/LostCargoDelivery.bmp b/EliteReporter/Assets/mTypes/LostCargoDelivery.bmp
diff --git a/EliteReporter/Assets/mTypes/Mining.bmp b/EliteReporter/Assets/mTypes/Mining.bmp
diff --git a/EliteReporter/Assets/mTypes/MultiStepCourierDelivery.bmp b/EliteReporter/Assets/mTypes/MultiStepCourierDelivery.bmp
diff --git a/EliteReporter/Assets/mTypes/PirateCargo.bmp b/EliteReporter/Assets/mTypes/PirateCargo.bmp
diff --git a/EliteReporter/Assets/mTypes/PlanetDelivery.bmp b/EliteReporter/Assets/mTypes/PlanetDelivery.bmp
diff --git a/EliteReporter/Assets/mTypes/SecretCargo.bmp b/EliteReporter/Assets/mTypes/SecretCargo.bmp
diff --git a/EliteReporter/Assets/mTypes/StealAndDeliver.bmp b/EliteReporter/Assets/mTypes/StealAndDeliver.bmp
diff --git a/EliteReporter/Assets/mTypes/TimedAssassination.bmp b/EliteReporter/Assets/mTypes/TimedAssassination.bmp
diff --git a/EliteReporter/EliteReporter.csproj b/EliteReporter/EliteReporter.csproj
@@ -320,12 +320,54 @@
     <Content Include="Assets\3302_rus.bmp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Assets\mTypes\Assassination.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\BountyKill.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\CargoTransfer.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\CourierDelivery.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\DataDelivery.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\FindAndDeliver.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\LostCargoDelivery.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\Mining.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\MultiStepCourierDelivery.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\PirateCargo.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\PlanetDelivery.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Assets\reward_eng.bmp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Assets\reward_rus.bmp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Assets\mTypes\SecretCargo.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\StealAndDeliver.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\mTypes\TimedAssassination.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">

diff --git a/EliteReporter/Forms/EditMissionForm.Designer.cs b/EliteReporter/Forms/EditMissionForm.Designer.cs
diff --git a/EliteReporter/Forms/EditMissionForm.cs b/EliteReporter/Forms/EditMissionForm.cs
@@ -24,6 +24,7 @@ public EditMissionForm(MissionInfo mInfo)
         private void changeButton_Click(object sender, EventArgs e)
         {
             mInfo.MissionName = missionNameTextBox.Text;
+            mInfo.MissionType = missionTypeTextBox.Text;
             try
             {
                 mInfo.MissionTakenDateTime = DateTime.ParseExact(dateTakenTextBox.Text, "dd.MM.yyyy HH:mm", CultureInfo.InvariantCulture);
@@ -59,6 +60,8 @@ private void EditMissionForm_Load(object sender, EventArgs e)
             dateTakenTextBox.Text = mInfo.MissionTakenDateTime.Value.ToString("dd.MM.yyyy HH:mm");
             stationTakenTextBox.Text = mInfo.MissionTakenEDProfile.PortName;
             systemTakenTextBox.Text = mInfo.MissionTakenEDProfile.SystemName;
+            if (mInfo.MissionType != null)
+                missionTypeTextBox.Text = mInfo.MissionType;
             if (mInfo.MissionFinishedEDProfile != null)
             {
                 stationFinishTextBox.Text = mInfo.MissionFinishedEDProfile.PortName;

diff --git a/EliteReporter/Forms/ReportForm.Designer.cs b/EliteReporter/Forms/ReportForm.Designer.cs
diff --git a/EliteReporter/Forms/ReportForm.cs b/EliteReporter/Forms/ReportForm.cs
@@ -57,8 +57,8 @@ private void analyzeScreenShot(string pathToBmp)
 
             if (missionListView.InvokeRequired)
             {
-                missionListView.BeginInvoke(callback, new object []{ pathToBmp });
-            }
+                missionListView.Invoke(callback, new object []{ pathToBmp });
+            }   
             else
             {
                 var result = analyzer.findAndAnalyzeMissionSummaryPage(pathToBmp);
@@ -274,6 +274,8 @@ private void fillMissionListViewItem(ListViewItem vItem, MissionInfo mInfo)
         {
             vItem.Text = mInfo.MissionTakenDateTime.Value.ToString("dd.MM.yyyy HH:mm");
             vItem.SubItems[missionNameHeader.Index] = new ListViewItem.ListViewSubItem(vItem, mInfo.MissionName);
+            if (mInfo.MissionType != null)
+                vItem.SubItems[missionTypeHeader.Index] = new ListViewItem.ListViewSubItem(vItem, mInfo.MissionType);
             vItem.SubItems[startSystemHeader.Index] = new ListViewItem.ListViewSubItem(vItem, mInfo.MissionTakenEDProfile.ToString());
             vItem.SubItems[rewardHeader.Index] = new ListViewItem.ListViewSubItem(vItem, mInfo.Reward.ToString());
             if (mInfo.MissionFinishedDateTime != null)

diff --git a/EliteReporter/Models/MissionInfo.cs b/EliteReporter/Models/MissionInfo.cs
@@ -11,6 +11,7 @@ namespace EliteReporter.Models
     public class MissionInfo
     {
         public string MissionName { get; set; }
+        public string MissionType { get; set; }
         public int Reward { get; set; }
 
         public DateTime? MissionTakenDateTime { get; set; }

diff --git a/EliteReporter/Utils/EDAPI.cs b/EliteReporter/Utils/EDAPI.cs
@@ -194,6 +194,7 @@ public EDProfile getProfile()
                 };
             } catch (Exception ex)
             {
+                Trace.TraceInformation("Failed to get profile: " + ex.Message);
                 return null;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -194,6 +194,7 @@ public EDProfile getProfile() @@
                     };
                 } catch (Exception ex)
                 {
+                    Trace.TraceInformation("Failed to get profile: " + ex.Message);
                     return null;
                 }
             }
@@ Expand Down @@