From 5467d0aec22396e3f65a2295b61bf530961b4b4b Mon Sep 17 00:00:00 2001
From: Jose Luis Cercos Pita <jlcercos@gmail.com>
Date: Fri, 16 Oct 2015 12:58:23 +0200
Subject: [PATCH] Created utilities to purge usless data inside the Ship
 instance

---
 src/Mod/Ship/Instance.py                      | 85 +++++++++++++++++++
 .../Ship/shipCreateLoadCondition/__init__.py  |  3 +
 src/Mod/Ship/shipCreateTank/TaskPanel.py      |  3 +
 src/Mod/Ship/shipCreateWeight/TaskPanel.py    |  3 +
 4 files changed, 94 insertions(+)

diff --git a/src/Mod/Ship/Instance.py b/src/Mod/Ship/Instance.py
index 03ccf9503..d5e1f6f66 100644
--- a/src/Mod/Ship/Instance.py
+++ b/src/Mod/Ship/Instance.py
@@ -131,6 +131,91 @@ class Ship:
         if prop == "Length" or prop == "Breadth" or prop == "Draft":
             pass
 
+    def cleanWeights(self, fp):
+        """Reanalyse the weights list looking for duplicated opbjects, or
+        removed ones.
+        """
+        if not len(fp.Weights):
+            return
+        # Filter out the duplicated elements
+        filtered_list = []
+        [filtered_list.append(x) for x in fp.Weights if x not in filtered_list]
+        if cmp(fp.Weights, filtered_list):
+            fp.Weights = filtered_list
+        # Filter out the removed/non-valid objects
+        object_names = []
+        for obj in fp.Document.Objects:
+            object_names.append(obj.Name)
+        filtered_list = []
+        for obj_name in fp.Weights:
+            if obj_name in object_names:
+                for obj in fp.Document.Objects:
+                    if obj.Name == obj_name:
+                        try:
+                            if obj.IsWeight: filtered_list.append(obj_name)
+                        except:
+                            pass
+                        break
+        if cmp(fp.Weights, filtered_list):
+            fp.Weights = filtered_list
+
+    def cleanTanks(self, fp):
+        """Reanalyse the weights list looking for duplicated opbjects, or
+        removed ones.
+        """
+        if not len(fp.Tanks):
+            return
+        # Filter out the duplicated elements
+        filtered_list = []
+        [filtered_list.append(x) for x in fp.Tanks if x not in filtered_list]
+        if cmp(fp.Tanks, filtered_list):
+            fp.Tanks = filtered_list
+        # Filter out the removed/non-valid objects
+        object_names = []
+        for obj in fp.Document.Objects:
+            object_names.append(obj.Name)
+        filtered_list = []
+        for obj_name in fp.Tanks:
+            if obj_name in object_names:
+                for obj in fp.Document.Objects:
+                    if obj.Name == obj_name:
+                        try:
+                            if obj.IsTank: filtered_list.append(obj_name)
+                        except:
+                            pass
+                        break
+        if cmp(fp.Tanks, filtered_list):
+            fp.Tanks = filtered_list
+
+    def cleanLoadConditions(self, fp):
+        """Reanalyse the weights list looking for duplicated opbjects, or
+        removed ones.
+        """
+        if not len(fp.LoadConditions):
+            return
+        # Filter out the duplicated elements
+        filtered_list = []
+        [filtered_list.append(x) for x in fp.LoadConditions if x not in filtered_list]
+        if cmp(fp.LoadConditions, filtered_list):
+            fp.LoadConditions = filtered_list
+        # Filter out the removed/non-valid objects
+        object_names = []
+        for obj in fp.Document.Objects:
+            object_names.append(obj.Name)
+        filtered_list = []
+        for obj_name in fp.LoadConditions:
+            if obj_name in object_names:
+                for obj in fp.Document.Objects:
+                    if obj.Name == obj_name:
+                        try:
+                            if obj.TypeId == 'Spreadsheet::Sheet':
+                                filtered_list.append(obj_name)
+                        except:
+                            pass
+                        break
+        if cmp(fp.LoadConditions, filtered_list):
+            fp.LoadConditions = filtered_list
+
     def execute(self, fp):
         """Detects the entity recomputations.
 
diff --git a/src/Mod/Ship/shipCreateLoadCondition/__init__.py b/src/Mod/Ship/shipCreateLoadCondition/__init__.py
index 3b79e6cd8..f115e7e95 100644
--- a/src/Mod/Ship/shipCreateLoadCondition/__init__.py
+++ b/src/Mod/Ship/shipCreateLoadCondition/__init__.py
@@ -125,6 +125,9 @@ def load():
     lcs = ship.LoadConditions[:]
     lcs.append(s.Name)
     ship.LoadConditions = lcs
+    ship.Proxy.cleanWeights(ship)
+    ship.Proxy.cleanTanks(ship)
+    ship.Proxy.cleanLoadConditions(ship)
 
     # Recompute to take the changes
     App.activeDocument().recompute()
\ No newline at end of file
diff --git a/src/Mod/Ship/shipCreateTank/TaskPanel.py b/src/Mod/Ship/shipCreateTank/TaskPanel.py
index b97b95655..c060ba914 100644
--- a/src/Mod/Ship/shipCreateTank/TaskPanel.py
+++ b/src/Mod/Ship/shipCreateTank/TaskPanel.py
@@ -50,6 +50,9 @@ class TaskPanel:
         tanks = ship.Tanks[:]
         tanks.append(obj.Name)
         ship.Tanks = tanks
+        ship.Proxy.cleanWeights(ship)
+        ship.Proxy.cleanTanks(ship)
+        ship.Proxy.cleanLoadConditions(ship)
 
         App.ActiveDocument.recompute()
         return True
diff --git a/src/Mod/Ship/shipCreateWeight/TaskPanel.py b/src/Mod/Ship/shipCreateWeight/TaskPanel.py
index 122deea52..6af196eb9 100644
--- a/src/Mod/Ship/shipCreateWeight/TaskPanel.py
+++ b/src/Mod/Ship/shipCreateWeight/TaskPanel.py
@@ -69,6 +69,9 @@ class TaskPanel:
         weights = ship.Weights[:]
         weights.append(obj.Name)
         ship.Weights = weights
+        ship.Proxy.cleanWeights(ship)
+        ship.Proxy.cleanTanks(ship)
+        ship.Proxy.cleanLoadConditions(ship)
 
         App.ActiveDocument.recompute()
         return True