From c2d309430e31025e0590c81f008b6a3bf60aef4c Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 20 Apr 2019 04:10:32 +0300 Subject: [PATCH] Make sure cargo-module drag commands are using actual fit data too --- gui/builtinAdditionPanes/cargoView.py | 2 +- gui/builtinViews/fittingView.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index fd63864ca..e6ab56150 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -128,7 +128,7 @@ class CargoView(d.Display): self.mainFrame.command.Submit(cmd.GuiLocalModuleToCargoCommand( fitID=self.mainFrame.getActiveFit(), - modPosition=fit.modules[modIdx].modPosition, + modPosition=modIdx, cargoItemID=dstCargoItemID, copy=wx.GetMouseState().cmdDown)) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 49363d41e..54fbb8244 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -428,11 +428,12 @@ class FittingView(d.Display): if not isinstance(mod, Module): return - self.mainFrame.command.Submit(cmd.GuiCargoToLocalModuleCommand( - fitID=self.mainFrame.getActiveFit(), - cargoItemID=cargoItemID, - modPosition=mod.modPosition, - copy=wx.GetMouseState().cmdDown)) + fitID = self.mainFrame.getActiveFit() + fit = Fit.getInstance().getFit(fitID) + if mod in fit.modules: + position = fit.modules.index(mod) + self.mainFrame.command.Submit(cmd.GuiCargoToLocalModuleCommand( + fitID=fitID, cargoItemID=cargoItemID, modPosition=position, copy=wx.GetMouseState().cmdDown)) def swapItems(self, x, y, srcIdx): """Swap two modules in fitting window"""