Implemented fit add to projected but currently it is disabled till projected view plays nice

gui/additionsPane.py

@@ -26,9 +26,6 @@ from gui.projectedView import ProjectedView
 from gui.pyfatogglepanel import TogglePanel
 
 class AdditionsPane(TogglePanel):
-#    def collapseChanged(self, event):
-#        self.mainFrame.fittingPanel.Layout()
-#        self.GetPane().Layout()
 
     def __init__(self, parent):
 
@@ -40,8 +37,6 @@ class AdditionsPane(TogglePanel):
         baseSizer = wx.BoxSizer(wx.HORIZONTAL)
         pane.SetSizer(baseSizer)
 
-#        self.Bind(wx.EVT_COLLAPSIBLEPANE_CHANGED, self.collapseChanged)
-
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
         self.notebook = wx.Notebook(pane)
@@ -52,9 +47,10 @@ class AdditionsPane(TogglePanel):
         self.notebook.AddPage(DroneView(self.notebook), "Drones")
         self.notebook.AddPage(ImplantView(self.notebook), "Implants")
         self.notebook.AddPage(BoosterView(self.notebook), "Boosters")
-        self.notebook.AddPage(ProjectedView(self.notebook), "Projected")
 
-#        self.Expand()
+        self.projectedPage = ProjectedView(self.notebook)
+        self.notebook.AddPage(self.projectedPage, "Projected")
+
 
     PANES = ["Drones", "Implants", "Boosters"]
     def select(self, name):

gui/shipBrowser.py

@@ -7,6 +7,7 @@ import service
 import time
 import os
 import config
+import service.fit
 
 from wx.lib.buttons import GenBitmapButton
 
@@ -1393,7 +1394,7 @@ class FitItem(wx.Window):
         self.editWidth = 150
         self.dragging = False
         self.dragged = False
-        self.dragMotionTrail = 10
+        self.dragMotionTrail = 5
         self.dragMotionTrigger = self.dragMotionTrail
         self.dragWindow = None
 
@@ -1553,6 +1554,8 @@ class FitItem(wx.Window):
             self.dragWindow = None
 
             targetWnd = wx.FindWindowAtPointer()
+
+            pjWnd = self.mainFrame.additionsPane.projectedPage
             msWnd = self.mainFrame.fitMultiSwitch
             cfitWnd = self.mainFrame.fitMultiSwitch.GetCurrentPage()
 
@@ -1565,6 +1568,14 @@ class FitItem(wx.Window):
                 if self.mainFrame.getActiveFit():
                     self.mainFrame.fitMultiSwitch.AddTab()
                 wx.PostEvent(self.mainFrame, FitSelected(fitID=self.fitID))
+#            elif targetWnd == pjWnd:
+#                activeFit = self.mainFrame.getActiveFit()
+#                if activeFit:
+#                    fitInst = service.fit.Fit.getInstance()
+#                    draggedFit = fitInst.getFit(self.fitID)
+#                    fitInst.project(activeFit,draggedFit)
+#                    wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=activeFit))
+
 
             event.Skip()
             return