Complete the vessel's freq-list dialog

Author: KSP-TaxiService

src/CommNetConstellation/CommNetLayer/CNCCommNetVessel.cs

@@ -56,7 +56,8 @@ public class CNCAntennaPartInfo
         public double antennaCombinableExponent;
         public bool antennaCombinable;
         public AntennaType antennaType;
-        public uint GUID;
+        public Part partReference;
+        public ProtoPartSnapshot partSnapshotReference = null;
         public bool inUse; // selected by user to be used
         public bool canComm; //fixed and deployable antennas
     }
@@ -70,7 +71,7 @@ public enum FrequencyListOperation
         {
             AutoBuild,
             LockList,
-            UpdateOnly
+            //UpdateOnly //cannot find any use
         };
 
         //http://forum.kerbalspaceprogram.com/index.php?/topic/141574-kspfield-questions/&do=findComment&comment=2625815
@@ -177,7 +178,8 @@ protected List<CNCAntennaPartInfo> readAntennaData()
                         newAntennaPartInfo.antennaCombinable = thisAntenna.CommCombinable;
                         newAntennaPartInfo.antennaCombinableExponent = thisAntenna.CommCombinableExponent;
                         newAntennaPartInfo.antennaType = thisAntenna.CommType;
-                        newAntennaPartInfo.GUID = thisPart.craftID; // good enough
+                        newAntennaPartInfo.partReference = thisPart; //unique ID for part is not available
+                        newAntennaPartInfo.partSnapshotReference = partSnapshot;
                         newAntennaPartInfo.canComm = (!this.vessel.loaded) ? thisAntenna.CanCommUnloaded(partModuleSnapshot) : thisAntenna.CanComm();
 
                         populatedAntennaInfo = true;
@@ -264,19 +266,20 @@ public short getStrongestFrequency()
         /// </summary>
         private short computeStrongestFrequency(Dictionary<short, double> dict)
         {
-            short freq = -1;
-            double power = 0;
-            foreach(short key in dict.Keys)
-            {
-                if (power < dict[key])
-                {
-                    power = dict[key];
-                    freq = key;
-                }
-            }
+            if (dict.Count < 1)
+                return -1;
+            else if (dict.Count == 1)
+                return dict.Keys.First();
 
-            //TODO: two freqs of equal comm power? - choose over public; pick lowest freq
+            List<KeyValuePair<short, double>> decreasingFreqs= dict.OrderByDescending(x => x.Value).ToList();
+            short freq = decreasingFreqs[0].Key;
 
+            if(freq == CNCSettings.Instance.PublicRadioFrequency)
+            {
+                if (decreasingFreqs[0].Value == decreasingFreqs[1].Value)
+                    freq = decreasingFreqs[1].Key; // pick next freq of same comm power
+            }
+            
             return freq;
         }
 
@@ -296,7 +299,7 @@ public bool isFreqListEditable()
         /// <summary>
         /// Notify CommNet vessel on antenna change (like changing frequency and deploy/retract antenna)
         /// </summary>
-        public void OnAntennaChange()//TODO: bad design. replace it with something better
+        public void OnAntennaChange()
         {
             this.vesselAntennas = readAntennaData();
 
@@ -308,9 +311,6 @@ public void OnAntennaChange()//TODO: bad design. replace it with something bette
                 case FrequencyListOperation.LockList: // dont change current freq dict
                     this.strongestFreq = computeStrongestFrequency(this.FrequencyDict);
                     break;
-                case FrequencyListOperation.UpdateOnly:
-                    //TODO: complete updateonly function
-                    break;
             }
         }
 
@@ -319,7 +319,11 @@ public void OnAntennaChange()//TODO: bad design. replace it with something bette
         /// </summary>
         public void rebuildFreqList(bool readAntennaData = false)
         {
-            if (!isFreqListEditable()) return;
+            if (!isFreqListEditable())
+            {
+                this.strongestFreq = computeStrongestFrequency(this.FrequencyDict);
+                return;
+            }
 
             if(readAntennaData)
                 this.vesselAntennas = this.readAntennaData();
@@ -364,26 +368,23 @@ public void clearFreqList()
         /// <summary>
         /// Replace one frequency in the particular antenna
         /// </summary>
-        public void updateFrequency(uint GUID, short newFrequency)
+        public void updateFrequency(CNCAntennaPartInfo partInfo, short newFrequency)
         {
             if (!Constellation.isFrequencyValid(newFrequency))
             {
                 CNCLog.Error("New frequency {0} is out of the range [0,{1}]!", newFrequency, short.MaxValue);
                 return;
             }
 
-            CNCAntennaPartInfo partInfo = this.vesselAntennas.Find(x => x.GUID == GUID);
             partInfo.frequency = newFrequency;
 
             if (this.Vessel.loaded)
             {
-                CNConstellationAntennaModule mod = this.Vessel.FindPartModulesImplementing<CNConstellationAntennaModule>().Find(x => x.part.craftID == GUID);
-                mod.Frequency = newFrequency;
+                partInfo.partReference.FindModuleImplementing<CNConstellationAntennaModule>().Frequency = newFrequency;
             }
             else
             {
-                ProtoPartModuleSnapshot cncAntMod = this.vessel.protoVessel.protoPartSnapshots.Find(x => x.partInfo.partPrefab.craftID == GUID).FindModule("CNConstellationAntennaModule");
-                cncAntMod.moduleValues.SetValue("Frequency", newFrequency);
+                partInfo.partSnapshotReference.FindModule("CNConstellationAntennaModule").moduleValues.SetValue("Frequency", newFrequency);
             }
 
             CNCLog.Debug("Update the antenna of CommNet vessel '{0}' to {1}", this.Vessel.GetName(), newFrequency);
@@ -423,20 +424,17 @@ public void replaceAllFrequencies(short oldFrequency, short newFrequency)
         /// <summary>
         /// Turn on or off the specific antenna
         /// </summary>
-        public void toggleAntenna(uint GUID, bool inUse)
+        public void toggleAntenna(CNCAntennaPartInfo partInfo, bool inUse)
         {
-            CNCAntennaPartInfo partInfo = this.vesselAntennas.Find(x => x.GUID == GUID);
             partInfo.inUse = inUse;
 
             if (this.Vessel.loaded)
             {
-                CNConstellationAntennaModule mod = this.Vessel.FindPartModulesImplementing<CNConstellationAntennaModule>().Find(x => x.part.craftID == GUID);
-                mod.InUse = inUse;
+                partInfo.partReference.FindModuleImplementing<CNConstellationAntennaModule>().InUse = inUse;
             }
             else
             {
-                ProtoPartModuleSnapshot cncAntMod = this.vessel.protoVessel.protoPartSnapshots.Find(x => x.partInfo.partPrefab.craftID == GUID).FindModule("CNConstellationAntennaModule");
-                cncAntMod.moduleValues.SetValue("InUse", inUse);
+                partInfo.partSnapshotReference.FindModule("CNConstellationAntennaModule").moduleValues.SetValue("InUse", inUse);
             }
 
             CNCLog.Debug("Set the antenna '{0}' of CommNet vessel '{1}' to {2}", partInfo.name, this.Vessel.GetName(), inUse);

src/CommNetConstellation/UI/VesselMgtTools/AntennaTool.cs

@@ -36,7 +36,7 @@ public override List<DialogGUIBase> getContentComponents()
             {
                 CNCAntennaPartInfo antennaInfo = antennas[i];
 
-                DialogGUIToggle toggleBtn = new DialogGUIToggle(antennaInfo.inUse, "", delegate (bool b) { vesselAntennaSelected(b, antennaInfo.GUID); actionCallbacks[0](); }, 20, 32);
+                DialogGUIToggle toggleBtn = new DialogGUIToggle(antennaInfo.inUse, "", delegate (bool b) { vesselAntennaSelected(b, antennaInfo); actionCallbacks[0](); }, 20, 32);
                 DialogGUILabel nameLabel = new DialogGUILabel(antennaInfo.name, style); nameLabel.size = new Vector2(160, 32);
                 DialogGUILabel comPowerLabel = new DialogGUILabel(string.Format("Com power: {0:0.00}", UIUtils.RoundToNearestMetricFactor(antennaInfo.antennaPower)), style); comPowerLabel.size = new Vector2(120, 32);
                 DialogGUILabel frequencyLabel = new DialogGUILabel(string.Format("(<color={0}>{1}</color>)", UIUtils.colorToHex(Constellation.getColor(antennaInfo.frequency)), antennaInfo.frequency), style); frequencyLabel.size = new Vector2(60, 32);
@@ -58,9 +58,9 @@ public override List<DialogGUIBase> getContentComponents()
             return layout;
         }
 
-        private void vesselAntennaSelected(bool useState, uint antennaGUID)
+        private void vesselAntennaSelected(bool useState, CNCAntennaPartInfo antenna)
         {
-            cncVessel.toggleAntenna(antennaGUID, useState);
+            cncVessel.toggleAntenna(antenna, useState);
             cncVessel.OnAntennaChange();
         }
 
@@ -70,7 +70,7 @@ private void toggleAllAntennas(bool state)
 
             for (int i = 0; i < allAntennas.Count; i++)
             {
-                cncVessel.toggleAntenna(allAntennas[i].GUID, state);
+                cncVessel.toggleAntenna(allAntennas[i], state);
             }
 
             cncVessel.OnAntennaChange();

src/CommNetConstellation/UI/VesselMgtTools/UpdateListTool.cs

@@ -43,12 +43,14 @@ public override List<DialogGUIBase> getContentComponents()
             nameColumn.AddChild(nameLabel2);
             descriptionColumn.AddChild(descriptionLabel2);
 
+            /*
             DialogGUIToggle toggleBtn3 = new DialogGUIToggle((cncVessel.FreqListOperation == FrequencyListOperation.UpdateOnly) ? true : false, "", delegate (bool b) { ListOperationSelected(b, FrequencyListOperation.UpdateOnly); }, 20, 32);
-            DialogGUILabel nameLabel3 = new DialogGUILabel("Update Only", style); nameLabel3.size = new Vector2(80, 32);
+            DialogGUILabel nameLabel3 = new DialogGUILabel("Freq Only", style); nameLabel3.size = new Vector2(80, 32);
             DialogGUILabel descriptionLabel3 = new DialogGUILabel("Update the affected frequency in the list only (not yet)", style); descriptionLabel3.size = new Vector2(350, 32);
             toggleGrp.AddChild(toggleBtn3);
             nameColumn.AddChild(nameLabel3);
             descriptionColumn.AddChild(descriptionLabel3);
+            */
 
             layout.Add(new DialogGUIHorizontalLayout(true, false, 0, new RectOffset(), TextAnchor.MiddleLeft, new DialogGUIBase[] { new DialogGUIVerticalLayout(false, false, 0, new RectOffset(), TextAnchor.MiddleLeft, toggleGrp), nameColumn, descriptionColumn }));
 

src/CommNetConstellation/UI/VesselMgtTools/VanillaFreqTool.cs

@@ -99,22 +99,21 @@ private void updateClick()
                     }
 
                     //ALL OK
-                    if (!this.cncVessel.canUpdateFreqList())
+                    if (!this.cncVessel.isFreqListEditable())
                     {
-                        this.cncVessel.OnAntennaChange();
                         return;
                     }
 
-                    this.antennas = this.cncVessel.getAllAntennaInfo(true);
-                    this.cncVessel.clearFreqList();
+                    //this.antennas = this.cncVessel.getAllAntennaInfo(true); //unnecessary
+                    //this.cncVessel.clearFreqList();
 
                     //update all antennas to new freq
                     for (int i=0; i< this.antennas.Count; i++)
                     {
                         CNCAntennaPartInfo thisAntenna = this.antennas[i];
-                        this.cncVessel.toggleAntenna(thisAntenna.GUID, true);
+                        this.cncVessel.toggleAntenna(thisAntenna, true);
                         if (thisAntenna.frequency != userFreq) // update each antenna to user freq
-                            this.cncVessel.updateFrequency(thisAntenna.GUID, userFreq);
+                            this.cncVessel.updateFrequency(thisAntenna, userFreq);
                     }
                     this.cncVessel.rebuildFreqList();
 
@@ -125,7 +124,7 @@ private void updateClick()
                         this.cncVessel.addToFreqList(CNCSettings.Instance.PublicRadioFrequency, commPower);
                     }
 
-                    actionCallbacks[0]();
+                    actionCallbacks[0]();//TODO: need better way
                 }
                 catch (FormatException e)
                 {