Merge branch 'master' into price_optimize

2019-03-19 08:42:06 +03:00
parent 7ddd3a35d1 573d8e068c
commit 8063647bba
16 changed files with 224 additions and 29 deletions
--- a/gui/builtinAdditionPanes/implantView.py
+++ b/gui/builtinAdditionPanes/implantView.py
@@ -204,7 +204,10 @@ class ImplantDisplay(d.Display):

    def removeImplant(self, implant):
        fitID = self.mainFrame.getActiveFit()
-        self.mainFrame.command.Submit(cmd.GuiRemoveImplantCommand(fitID, self.original.index(implant)))
+        sFit = Fit.getInstance()
+        fit = sFit.getFit(fitID)
+        if fit.implantLocation == ImplantLocation.FIT:
+            self.mainFrame.command.Submit(cmd.GuiRemoveImplantCommand(fitID, self.original.index(implant)))

    def click(self, event):
        event.Skip()