Merge branch 'EffectTest' of https://github.com/Ebag333/Pyfa into Ebag333-EffectTest

Conflicts:
	eos/saveddata/fit.py
	eos/saveddata/module.py

gui/itemStats.py

@@ -740,31 +740,44 @@ class ItemRequirements ( wx.Panel ):
 
 class ItemEffects (wx.Panel):
     def __init__(self, parent, stuff, item):
-        wx.Panel.__init__ (self, parent)
-        mainSizer = wx.BoxSizer( wx.VERTICAL )
+        wx.Panel.__init__(self, parent)
+        self.item = item
+
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         self.effectList = AutoListCtrl(self, wx.ID_ANY,
-                                     style =
-                                      #wx.LC_HRULES |
-                                      #wx.LC_NO_HEADER |
-                                      wx.LC_REPORT |wx.LC_SINGLE_SEL |wx.LC_VRULES |wx.NO_BORDER)
-        mainSizer.Add( self.effectList, 1, wx.ALL|wx.EXPAND, 0 )
-        self.SetSizer( mainSizer )
+                                       style=
+                                       # wx.LC_HRULES |
+                                       # wx.LC_NO_HEADER |
+                                       wx.LC_REPORT | wx.LC_SINGLE_SEL | wx.LC_VRULES | wx.NO_BORDER)
+        mainSizer.Add(self.effectList, 1, wx.ALL | wx.EXPAND, 0)
+        self.SetSizer(mainSizer)
 
+        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnClick, self.effectList)
         if config.debug:
-            self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnClick, self.effectList)
+            self.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.OnRightClick, self.effectList)
+
+        self.PopulateList()
+
+    def PopulateList(self):
 
         self.effectList.InsertColumn(0,"Name")
-        self.effectList.InsertColumn(1,"Implemented")
+        self.effectList.InsertColumn(1,"Active")
+        self.effectList.InsertColumn(2, "Type")
         if config.debug:
-            self.effectList.InsertColumn(2,"ID")
+            self.effectList.InsertColumn(3, "Run Time")
+            self.effectList.InsertColumn(4,"ID")
 
         #self.effectList.SetColumnWidth(0,385)
 
         self.effectList.setResizeColumn(0)
+        self.effectList.SetColumnWidth(1,50)
+        self.effectList.SetColumnWidth(2, 80)
+        if config.debug:
+            self.effectList.SetColumnWidth(3, 65)
+            self.effectList.SetColumnWidth(4, 40)
 
-        self.effectList.SetColumnWidth(1,100)
-
+        item = self.item
         effects = item.effects
         names = list(effects.iterkeys())
         names.sort()
@@ -772,19 +785,55 @@ class ItemEffects (wx.Panel):
         for name in names:
             index = self.effectList.InsertStringItem(sys.maxint, name)
 
-            try:
-                implemented = "Yes" if effects[name].isImplemented else "No"
-            except:
-                implemented = "Erroneous"
+            if effects[name].isImplemented:
+                if effects[name].activeByDefault:
+                    activeByDefault = "Yes"
+                else:
+                    activeByDefault = "No"
+            else:
+                activeByDefault = ""
 
-            self.effectList.SetStringItem(index, 1, implemented)
+            effectTypeText = ""
+            if effects[name].type:
+                for effectType in effects[name].type:
+                    effectTypeText += effectType + " "
+                    pass
+
+            if effects[name].runTime and effects[name].isImplemented:
+                effectRunTime = str(effects[name].runTime)
+            else:
+                effectRunTime = ""
+
+            self.effectList.SetStringItem(index, 1, activeByDefault)
+            self.effectList.SetStringItem(index, 2, effectTypeText)
             if config.debug:
-                self.effectList.SetStringItem(index, 2, str(effects[name].ID))
+                self.effectList.SetStringItem(index, 3, effectRunTime)
+                self.effectList.SetStringItem(index, 4, str(effects[name].ID))
 
         self.effectList.RefreshRows()
         self.Layout()
 
     def OnClick(self, event):
+        """
+        Debug use: toggle effects on/off.
+        Affects *ALL* items that use that effect.
+        Is not stateful.  Will reset if Pyfa is closed and reopened.
+        """
+
+        try:
+            activeByDefault = getattr(self.item.effects[event.GetText()], "activeByDefault")
+            if activeByDefault:
+                setattr(self.item.effects[event.GetText()], "activeByDefault", False)
+            else:
+                setattr(self.item.effects[event.GetText()], "activeByDefault", True)
+
+        except AttributeError:
+            # Attribute doesn't exist, do nothing
+            pass
+
+        self.RefreshValues(event)
+
+    def OnRightClick(self, event):
         """
         Debug use: open effect file with default application.
         If effect file does not exist, create it
@@ -804,6 +853,14 @@ class ItemEffects (wx.Panel):
             import subprocess
             subprocess.call(["xdg-open", file])
 
+    def RefreshValues(self, event):
+        self.Freeze()
+        self.effectList.ClearAll()
+        self.PopulateList()
+        self.effectList.RefreshRows()
+        self.Layout()
+        self.Thaw()
+        event.Skip()
 
 ###########################################################################
 ## Class ItemAffectedBy