Changeset 1300

Timestamp:

2/7/2010 9:24:47 AM (5 weeks ago)

Author:

vessper

Message:

07/02/2010 (1.14.2.1300)

---

- V2: Updated with fixes 1294 - 1299

Location:

branches/EveHQv2

Files:

• . (modified) (1 prop)
• EveHQ.DataConverter/Resources/dbo_TABLES_MDB.sql (modified) (1 diff)
• EveHQ.PosManager/Data Classes/FuelType.cs (modified) (1 diff)
• EveHQ.PosManager/Forms/PoSManMainForm.cs (modified) (3 diffs)
• EveHQ.PosManager/Properties/AssemblyInfo.cs (modified) (1 diff)
• EveHQ/_latest.xml (modified) (1 diff)
• EveHQ/_updates.xml (modified) (1 diff)
• EveHQSetup/EveHQSetup.vdproj (modified) (4 diffs)

branches/EveHQv2

@@ -1 +1 @@
 /branches/PrismPhaseII:589-675
-/trunk:1195-1210,1216-1230,1232-1233,1235,1237,1239-1241,1243,1245-1253,1255-1290,1292
+/trunk:1195-1210,1216-1230,1232-1233,1235,1237,1239-1241,1243,1245-1253,1255-1290,1292,1294-1299

@@ -1 +1 @@
 /branches/PrismPhaseII:589-675
-/trunk:1195-1210,1216-1230,1232-1233,1235,1237,1239-1241,1243,1245-1253,1255-1290,1292
+/trunk:1195-1210,1216-1230,1232-1233,1235,1237,1239-1241,1243,1245-1253,1255-1290,1292,1294-1299

branches/EveHQv2/EveHQ.DataConverter/Resources/dbo_TABLES_MDB.sql

@@ -785 +785 @@
   divisionID            integer             NULL,
   corporationID         integer             NULL,
-  stationID             integer             NULL,
+  locationID             integer             NULL,
   `level`               integer         NULL,
   quality               integer        NULL,

branches/EveHQv2/EveHQ.PosManager/Data Classes/FuelType.cs

@@ -124 +124 @@
                 {
                     if (used > 0)
-                        ret = Math.Floor((pcMult * sov * pQty) + 1);
+                        ret = Math.Ceiling(pcMult * sov * pQty);
                     else
                         ret = Math.Floor(pcMult * sov * pQty);

branches/EveHQv2/EveHQ.PosManager/Forms/PoSManMainForm.cs

@@ -2406 +2406 @@
                     ml = EveHQ.Core.DataFunctions.GetData(strSQL);
 
-                    p.Moon = ml.Tables[0].Rows[0].ItemArray[0].ToString();
+                    if (ml != null)
+                        if ((ml.Tables != null) && (ml.Tables.Count > 0))
+                            if ((ml.Tables[0].Rows != null) && (ml.Tables[0].Rows.Count > 0))
+                                p.Moon = ml.Tables[0].Rows[0].ItemArray[0].ToString();
+                            else
+                                p.Moon = "Unknown";
+                        else
+                            p.Moon = "Unknown";
+                    else
+                        p.Moon = "Unknown";
 
                     switch (td.stateV)
@@ -5069 +5078 @@
                             }
 
+                            if (xfIn <= 0)
+                                xfIn = 1;
+                            if (xfOut <= 0)
+                                xfOut = 1;
                             if ((fInp) && (!fOutp))
                             {
@@ -5744 +5757 @@
             {
                 // Plain mineral incomming
-                qty = SrcMod.selMineral.reactQty;
-                mult = SrcMod.selMineral.portionSize;
-                vol = SrcMod.selMineral.volume;
-                bPrice = SrcMod.selMineral.basePrice;
-
-                retV[0] = qty;
-                retV[1] = retV[0] * vol * mult;
+
+                // There are some cases, where the destination is a reaction, that the reaction
+                // should override on silo due to the selMineral.reactQty being just plain Wrong!
+                if ((DstMod.ModType == 5) || (DstMod.ModType == 6) || (DstMod.ModType == 7))
+                {
+                    foreach (InOutData iod in DstMod.selReact.inputs)
+                    {
+                        if (iod.typeID == SrcMod.selMineral.typeID)
+                        {
+                            qty = iod.qty;
+                            mult = SrcMod.selMineral.portionSize;
+                            vol = SrcMod.selMineral.volume;
+                            bPrice = SrcMod.selMineral.basePrice;
+                            rQty = SrcMod.selMineral.reactQty;
+
+                            retV[0] = qty * rQty;
+                            retV[1] = retV[0] * vol * mult;
+                        }
+                    }
+                }
+                else
+                {
+                    qty = SrcMod.selMineral.reactQty;
+                    mult = SrcMod.selMineral.portionSize;
+                    vol = SrcMod.selMineral.volume;
+                    bPrice = SrcMod.selMineral.basePrice;
+
+                    retV[0] = qty;
+                    retV[1] = retV[0] * vol * mult;
+                }
             }
             else if (SrcMod.Category == "Mobile Reactor")

branches/EveHQv2/EveHQ.PosManager/Properties/AssemblyInfo.cs

@@ -33 +33 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.14.1.1283")]
-[assembly: AssemblyFileVersion("1.14.1.1283")]
+[assembly: AssemblyVersion("1.14.2.1296")]
+[assembly: AssemblyFileVersion("1.14.2.1296")]

branches/EveHQv2/EveHQ/_latest.xml

@@ -110 +110 @@
       <name>EveHQ.PosManager.dll</name>
       <type>Plug-in</type>
-      <version>1.14.1.1283</version>
+      <version>1.14.2.1296</version>
       <requires/>
       <hasDebug>True</hasDebug>

branches/EveHQv2/EveHQ/_updates.xml

@@ -104 +104 @@
       <name>EveHQ.PosManager.dll</name>
       <type>Plug-in</type>
-      <version>1.14.1.1283</version>
+      <version>1.14.2.1296</version>
       <hasDebug>True</hasDebug>
       <description>POS Design and Management Plug-in</description>

branches/EveHQv2/EveHQSetup/EveHQSetup.vdproj

@@ -502 +502 @@
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:EveHQ.CoreControls, Version=1.14.1.1282, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:EveHQ.CoreControls, Version=1.14.2.1292, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
@@ -604 +604 @@
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:EveHQ.Core, Version=1.14.1.1282, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:EveHQ.Core, Version=1.14.2.1292, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
@@ -698 +698 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:EveHQ"
-        "ProductCode" = "8:{440002B9-AB9A-48C2-88F8-409BFC7AB75F}"
-        "PackageCode" = "8:{AE13DBB0-3064-4528-AF7C-B5678B55133A}"
+        "ProductCode" = "8:{82D02D4B-C843-4DCB-9DDD-351DA535D2DD}"
+        "PackageCode" = "8:{F2FF4F53-8A1A-4648-9AEB-81E51A706B8C}"
         "UpgradeCode" = "8:{5EBB0328-70C2-4A58-A4AC-225419B25E51}"
         "RestartWWWService" = "11:FALSE"
@@ -705 +705 @@
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.14.1"
+        "ProductVersion" = "8:1.14.2"
         "Manufacturer" = "8:Indicium Technologies"
         "ARPHELPTELEPHONE" = "8:"

@@ -1 +1 @@
 /branches/PrismPhaseII:589-675
-/trunk:1195-1210,1216-1230,1232-1233,1235,1237,1239-1241,1243,1245-1253,1255-1290,1292
+/trunk:1195-1210,1216-1230,1232-1233,1235,1237,1239-1241,1243,1245-1253,1255-1290,1292,1294-1299