Tmp merge

src/TechObject/ObjectsTree/UniversalObject/AttachedObjects.cs

@@ -29,8 +29,7 @@ public override bool SetNewValue(string newValue)
             string oldValue = Value;
             var thisObjNum = owner?.GlobalNum ?? 0;
             var isGeneric = owner is GenericTechObject;
-            List<int> newNumbers = strategy.GetValidTechObjNums(newValue,
-                thisObjNum, isGeneric);
+            List<int> newNumbers = strategy.GetValidTechObjNums(newValue, thisObjNum);
 
             newValue = string.Join(" ", newNumbers);
             string sortedValue = MoveNewValuesInTheEndOfString(newValue,
@@ -295,7 +294,7 @@ public string Check()
         {
             var res = "";
             var objNum = TechObjectManager.GetInstance().GetTechObjectN(Owner);
-            List<int> numbers = strategy.GetValidTechObjNums(Value, objNum, Owner is GenericTechObject);
+            List<int> numbers = strategy.GetValidTechObjNums(Value, objNum);
             string checkedValue = string.Join(" ", numbers);
             if (checkedValue != Value)
             {
@@ -631,8 +630,9 @@ public interface IAttachedObjectsStrategy
             /// </summary>
             /// <param name="value">Входная строка</param>
             /// <param name="objNum">Номер редактируемого объекта</param>
+            /// <param name="isGeneric">Редактируемый объект - типовой</param>
             /// <returns></returns>
-            List<int> GetValidTechObjNums(string value, int objNum, bool isGeneric);
+            List<int> GetValidTechObjNums(string value, int objNum, bool isGeneric = false);
 
             /// <summary>
             /// Нужно ли инициализировать привязанные объекты
@@ -708,7 +708,7 @@ public BaseStrategy(string name, string luaName,
             /// <param name="selectedObjNum">Номер редактируемого объекта</param>
             /// <param name="isGeneric"><paramref name="selectedObjNum"/> - типовой объект</param>
             public List<int> GetValidTechObjNums(string value,
-                int selectedObjNum, bool isGeneric)
+                int selectedObjNum, bool isGeneric = false)
             {
                 var validNumbers = new List<int>();
                 List<int> numbers = value.Split(' ')

src/TechObject/ObjectsTree/UniversalObject/GenericTechObject.cs

@@ -69,6 +69,7 @@ public void SetUpEventsHandlers()
             paramsManager.ValueChanged += UpdateParamsManager;
             ModesManager.ValueChanged += UpdateModesManager;
             AttachedObjects.ValueChanged += UpdateAttachedObjects;
+            BaseTechObject.ObjectGroupsList.ForEach(gr => gr.ValueChanged += UpdateObjectGroups);
         }
 
         /// <summary>
@@ -83,6 +84,7 @@ public void Update()
             UpdateEquipment(null);
             UpdateParamsManager(null);
             UpdateTechObjectsData(null);
+            UpdateObjectGroups(null);
         }
 
         /// <summary>
@@ -99,6 +101,24 @@ private void UpdateAttachedObjects(object sender)
             InheritedTechObjects.ForEach(to => to.AttachedObjects.UpdateOnGenericTechObject(AttachedObjects));
         }
 
+        /// <summary>
+        /// Обновить поля групп танков: Группа танков, Источники/Приемники
+        /// </summary>
+        private void UpdateObjectGroups(object sender)
+        {
+            inheritedTechObjects.ForEach(to =>
+            {
+                var genericObjGrList = BaseTechObject.ObjectGroupsList;
+                var inheritedObjGrList = to.BaseTechObject.ObjectGroupsList;
+
+                var objectsGroups = genericObjGrList.Zip(inheritedObjGrList, (g, i) => new { Generic = g, Inherited = i });
+                foreach (var og in objectsGroups)
+                {
+                    og.Inherited.UpdateOnGenericTechObject(og.Generic);
+                }
+            });
+        }
+
         /// <summary>
         /// Обновить поле "Операции"
         /// </summary>

src/TechObject/ObjectsTree/UniversalObject/ModesManager.cs

@@ -603,6 +603,7 @@ public void UpdateOnGenericTechObject(ModesManager genericModesManager)
                 if (mode is null)
                 {
                     mode = AddMode(genericMode.Name, genericMode.BaseOperation.LuaName);
+                    mode.AddParent(this);
                 }
                 else
                 {