Merge branch 'default-database-profiles' of git://github.com/Ebag333/Pyfa

gui/mainFrame.py

@@ -38,6 +38,7 @@ import gui.aboutData
 import gui.chromeTabs
 import gui.utils.animUtils as animUtils
 import gui.globalEvents as GE
+import eos.db.saveddata.loadDefaultDatabaseValues as loadDefaultDatabaseValues
 
 from gui.bitmapLoader import BitmapLoader
 from gui.mainMenuBar import MainMenuBar
@@ -405,10 +406,22 @@ class MainFrame(wx.Frame):
     def goForums(self, event):
         webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=466425')
 
+    def loadDatabaseDefaults(self, event):
+        # Import default database values
+        importDBDefaults = loadDefaultDatabaseValues.defaultDatabaseValues()
+        # Import values that must exist otherwise Pyfa breaks
+        importDBDefaults.importRequiredDefaults()
+        # Import default values for damage profiles
+        importDBDefaults.importDamageProfileDefaults()
+        # Import default values for target resist profiles
+        importDBDefaults.importResistProfileDefaults()
+
     def registerMenu(self):
         menuBar = self.GetMenuBar()
         # Quit
         self.Bind(wx.EVT_MENU, self.ExitApp, id=wx.ID_EXIT)
+        # Load Default Database values
+        self.Bind(wx.EVT_MENU, self.loadDatabaseDefaults, id=menuBar.importDatabaseDefaultsId)
         # Widgets Inspector
         if config.debug:
             self.Bind(wx.EVT_MENU, self.openWXInspectTool, id = self.widgetInspectMenuID)

gui/mainMenuBar.py

@@ -49,6 +49,7 @@ class MainMenuBar(wx.MenuBar):
         self.ssoLoginId = wx.NewId()
         self.attrEditorId = wx.NewId()
         self.toggleOverridesId = wx.NewId()
+        self.importDatabaseDefaultsId = wx.NewId()
 
         if 'wxMac' in wx.PlatformInfo and wx.VERSION >= (3,0):
             wx.ID_COPY = wx.NewId()
@@ -73,6 +74,8 @@ class MainMenuBar(wx.MenuBar):
         fileMenu.Append(self.exportSkillsNeededId, "Export &Skills Needed", "Export skills needed for this fitting")
         fileMenu.Append(self.importCharacterId, "Import C&haracter File", "Import characters into pyfa from file")
         fileMenu.AppendSeparator()
+        fileMenu.Append(self.importDatabaseDefaultsId, "Import D&atabase Defaults", "Imports missing database defaults")
+        fileMenu.AppendSeparator()
         fileMenu.Append(wx.ID_EXIT)
 
         # Edit menu
@@ -139,7 +142,6 @@ class MainMenuBar(wx.MenuBar):
                 attrItem = wx.MenuItem(windowMenu, self.attrEditorId, "Attribute Overrides\tCTRL+B")
                 attrItem.SetBitmap(BitmapLoader.getBitmap("fit_rename_small", "gui"))
                 windowMenu.AppendItem(attrItem)
-
                 editMenu.AppendSeparator()
                 editMenu.Append(self.toggleOverridesId, "Turn Overrides On")
 
@@ -172,5 +174,3 @@ class MainMenuBar(wx.MenuBar):
         self.Enable(self.revertCharId, char.isDirty)
 
         event.Skip()
-
-

gui/patternEditor.py

@@ -239,7 +239,7 @@ class DmgPatternEditorDlg(wx.Dialog):
 
         for field in self.DAMAGE_TYPES:
             edit = getattr(self, "%sEdit" % field)
-            amount = getattr(p, "%sAmount" % field)
+            amount = int(round(getattr(p, "%sAmount" % field)))
             edit.SetValue(amount)
 
         self.block = False