no more rarity background image + fixed previewed rarity background design in settings when sliders are were moving

2026-08-21 17:04:24 -05:00 · 2019-08-15 00:39:50 +02:00
parent 9ce856b79d
commit b46254669f
15 changed files with 98 additions and 251 deletions
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -265,14 +265,6 @@
    <Content Include="DLLs\csharp-wick.dll" />
    <Content Include="DLLs\ScintillaNET FindReplaceDialog.dll" />
    <Content Include="FModel.ico" />
-    <None Include="Resources\U512v1.png" />
-    <None Include="Resources\T512v1.png" />
-    <None Include="Resources\R512v1.png" />
-    <None Include="Resources\Marvel512v1.png" />
-    <None Include="Resources\M512v1.png" />
-    <None Include="Resources\L512v1.png" />
-    <None Include="Resources\E512v1.png" />
-    <None Include="Resources\C512v1.png" />
    <None Include="Resources\cTemplate.png" />
    <None Include="Resources\LBolt64.png" />
    <None Include="Resources\wTemplatev1.png" />
--- a/FModel/Forms/Settings.cs
+++ b/FModel/Forms/Settings.cs
@@ -40,6 +40,8 @@ namespace FModel.Forms
            // Check if watermark exists
            Utilities.CheckWatermark();

+            comboBox2.SelectedIndex = comboBox2.FindStringExact(Properties.Settings.Default.rarityDesign);
+
            //WATERMARK
            button1.Enabled     = Properties.Settings.Default.isWatermark;
            checkBox7.Checked   = Properties.Settings.Default.isWatermark;
@@ -48,8 +50,6 @@ namespace FModel.Forms
            trackBar1.Value     = Properties.Settings.Default.wOpacity;
            trackBar2.Value     = Properties.Settings.Default.wSize;

-            comboBox2.SelectedIndex = comboBox2.FindStringExact(Properties.Settings.Default.rarityDesign);
-
            //CHALLENGES
            button3.Enabled = Properties.Settings.Default.isChallengesTheme;
            button4.Enabled = Properties.Settings.Default.isChallengesTheme;
@@ -162,7 +162,15 @@ namespace FModel.Forms

                if (!string.IsNullOrEmpty(Properties.Settings.Default.wFilename))
                {
-                    Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate);
+                    Bitmap bmp = null;
+                    if (Properties.Settings.Default.loadFeaturedImage)
+                    {
+                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                    }
+                    else
+                    {
+                        bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                    }
                    Graphics g = Graphics.FromImage(bmp);

                    Image watermark = Image.FromFile(Properties.Settings.Default.wFilename);
@@ -180,7 +188,15 @@ namespace FModel.Forms
        {
            if (!string.IsNullOrEmpty(Properties.Settings.Default.wFilename))
            {
-                Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate);
+                Bitmap bmp = null;
+                if (checkBox8.Checked)
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                }
+                else
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                }
                Graphics g = Graphics.FromImage(bmp);

                Image watermark = Image.FromFile(Properties.Settings.Default.wFilename);
@@ -195,7 +211,15 @@ namespace FModel.Forms
        {
            if (!string.IsNullOrEmpty(Properties.Settings.Default.wFilename))
            {
-                Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate);
+                Bitmap bmp = null;
+                if (checkBox8.Checked)
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
+                }
+                else
+                {
+                    bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
+                }
                Graphics g = Graphics.FromImage(bmp);

                Image watermark = Image.FromFile(Properties.Settings.Default.wFilename);
--- a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs
+++ b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs
@@ -7,36 +7,55 @@ namespace FModel
 {
    static class Rarity
    {
-        #region flat design
-        private static void DrawFlatBackground(Graphics toDrawOn, Color background, Color backgroundUpDown, Color border)
+        private static void DrawBackground(Graphics toDrawOn, Color background, Color backgroundUpDown, Color border)
        {
-            toDrawOn.FillRectangle(new SolidBrush(background), new Rectangle(-1, -1, 522, 522));
+            switch (Settings.Default.rarityDesign)
+            {
+                case "Flat":
+                    toDrawOn.FillRectangle(new SolidBrush(background), new Rectangle(-1, -1, 522, 522));

-            GraphicsPath p = new GraphicsPath();
-            p.StartFigure();
-            p.AddLine(4, 438, 517, 383);
-            p.AddLine(517, 383, 517, 383 + 134);
-            p.AddLine(4, 383 + 134, 4, 383 + 134);
-            p.AddLine(4, 383 + 134, 4, 438);
-            p.CloseFigure();
-            toDrawOn.FillPath(new SolidBrush(backgroundUpDown), p);
+                    GraphicsPath p = new GraphicsPath();
+                    p.StartFigure();
+                    p.AddLine(4, 438, 517, 383);
+                    p.AddLine(517, 383, 517, 383 + 134);
+                    p.AddLine(4, 383 + 134, 4, 383 + 134);
+                    p.AddLine(4, 383 + 134, 4, 438);
+                    p.CloseFigure();
+                    toDrawOn.FillPath(new SolidBrush(Utilities.ChangeLightness(background, (float) 0.8)), p);

-            p.StartFigure();
-            p.AddLine(4, 4, 4, 38);
-            p.AddLine(4, 38, 325, 4);
-            p.CloseFigure();
-            toDrawOn.FillPath(new SolidBrush(backgroundUpDown), p);
+                    p.StartFigure();
+                    p.AddLine(4, 4, 4, 38);
+                    p.AddLine(4, 38, 325, 4);
+                    p.CloseFigure();
+                    toDrawOn.FillPath(new SolidBrush(Utilities.ChangeLightness(background, (float) 0.8)), p);

-            Pen pen = new Pen(border, 5);
-            pen.Alignment = PenAlignment.Inset;
-            toDrawOn.DrawRectangle(pen, new Rectangle(-1, -1, 522, 522));
+                    Pen pen = new Pen(border, 5);
+                    pen.Alignment = PenAlignment.Inset;
+                    toDrawOn.DrawRectangle(pen, new Rectangle(-1, -1, 522, 522));
+                    break;
+                case "Default":
+                    GraphicsPath path = new GraphicsPath();
+                    path.AddEllipse(-266, -266, 1044, 1044);
+
+                    PathGradientBrush pthGrBrush = new PathGradientBrush(path);
+                    pthGrBrush.CenterColor = background;
+                    Color[] colors = { backgroundUpDown };
+                    pthGrBrush.SurroundColors = colors;
+
+                    toDrawOn.FillEllipse(pthGrBrush, -266, -266, 1044, 1044);
+
+                    Pen pen2 = new Pen(border, 5);
+                    pen2.Alignment = PenAlignment.Inset;
+                    toDrawOn.DrawRectangle(pen2, new Rectangle(-1, -1, 522, 522));
+                    break;
+            }
        }

        private static void DrawSeriesBackground(JToken theItem, Graphics toDrawOn, string theSeries)
        {
            if (theSeries.Equals("MarvelSeries"))
            {
-                DrawFlatBackground(toDrawOn, Color.FromArgb(255, 165, 29, 30), Color.FromArgb(255, 128, 22, 31), Color.FromArgb(255, 237, 52, 52));
+                DrawBackground(toDrawOn, Color.FromArgb(255, 203, 35, 45), Color.FromArgb(255, 127, 14, 29), Color.FromArgb(255, 255, 67, 61));
            }
            else
            {
@@ -48,7 +67,7 @@ namespace FModel
        {
            if (specialMode == "ammo")
            {
-                DrawFlatBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 84, 84, 84), Color.FromArgb(255, 144, 144, 144));
+                DrawBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 70, 70, 70), Color.FromArgb(255, 158, 158, 158));
            }
            else
            {
@@ -68,97 +87,29 @@ namespace FModel
            switch (raritiesToken != null ? raritiesToken.Value<string>() : "")
            {
                case "EFortRarity::Transcendent":
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 155, 39, 69), Color.FromArgb(255, 120, 30, 60), Color.FromArgb(255, 223, 65, 104));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 213, 25, 68), Color.FromArgb(255, 134, 7, 45), Color.FromArgb(255, 255, 63, 88));
                    break;
                case "EFortRarity::Mythic":
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 170, 143, 47), Color.FromArgb(255, 132, 105, 37), Color.FromArgb(255, 217, 192, 72));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 186, 156, 54), Color.FromArgb(255, 115, 88, 26), Color.FromArgb(255, 238, 217, 81));
                    break;
                case "EFortRarity::Legendary":
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 170, 96, 47), Color.FromArgb(255, 132, 69, 37), Color.FromArgb(255, 217, 132, 72));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 192, 106, 56), Color.FromArgb(255, 115, 51, 26), Color.FromArgb(255, 236, 150, 80));
                    break;
                case "EFortRarity::Epic":
                case "EFortRarity::Quality":
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 96, 47, 170), Color.FromArgb(255, 69, 37, 132), Color.FromArgb(255, 141, 67, 195));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 129, 56, 194), Color.FromArgb(255, 66, 26, 115), Color.FromArgb(255, 178, 81, 237));
                    break;
                case "EFortRarity::Rare":
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 55, 92, 163), Color.FromArgb(255, 42, 77, 126), Color.FromArgb(255, 72, 121, 217));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 54, 105, 187), Color.FromArgb(255, 26, 68, 115), Color.FromArgb(255, 81, 128, 238));
                    break;
                case "EFortRarity::Common":
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 84, 84, 84), Color.FromArgb(255, 144, 144, 144));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 70, 70, 70), Color.FromArgb(255, 158, 158, 158));
                    break;
                default:
-                    DrawFlatBackground(toDrawOn, Color.FromArgb(255, 87, 155, 39), Color.FromArgb(255, 75, 120, 30), Color.FromArgb(255, 109, 219, 73));
+                    DrawBackground(toDrawOn, Color.FromArgb(255, 94, 188, 54), Color.FromArgb(255, 60, 115, 26), Color.FromArgb(255, 116, 239, 82));
                    break;
            }
        }
-        #endregion
-
-        #region default image
-        /// <summary>
-        /// check the rarity and return the right image
-        /// </summary>
-        /// <param name="theItem"></param>
-        /// <returns> the resource image depending on the rarity </returns>
-        private static Image GetRarityImage(JToken theItem)
-        {
-            JToken raritiesToken = theItem["Rarity"];
-            switch (raritiesToken != null ? raritiesToken.Value<string>() : "")
-            {
-                case "EFortRarity::Transcendent":
-                    return Resources.T512v1;
-                case "EFortRarity::Mythic":
-                    return Resources.M512v1;
-                case "EFortRarity::Legendary":
-                    return Resources.L512v1;
-                case "EFortRarity::Epic":
-                case "EFortRarity::Quality":
-                    return Resources.E512v1;
-                case "EFortRarity::Rare":
-                    return Resources.R512v1;
-                case "EFortRarity::Common":
-                    return Resources.C512v1;
-                default:
-                    return Resources.U512v1;
-            }
-        }
-
-        /// <summary>
-        /// check the series and return the right image
-        /// if no series known, return the normal item rarity image with GetRarityImage
-        /// </summary>
-        /// <param name="theItem"></param>
-        /// <returns> the resource image depending on the series </returns>
-        private static Image GetSeriesImage(JToken theItem, string theSeries)
-        {
-            if (theSeries.Equals("MarvelSeries"))
-            {
-                return Resources.Marvel512v1;
-            }
-            else
-            {
-                return GetRarityImage(theItem);
-            }
-        }
-
-        /// <summary>
-        /// if specialMode isn't null and is known return the right image
-        /// if specialMode is unknown, return the normal item rarity image with GetRarityImage
-        /// </summary>
-        /// <param name="theItem"></param>
-        /// <param name="specialMode"></param>
-        /// <returns> the resource image depending on specialMode </returns>
-        private static Image GetSpecialModeImage(JToken theItem, string specialMode)
-        {
-            if (specialMode == "ammo")
-            {
-                return Resources.C512v1;
-            }
-            else
-            {
-                return GetRarityImage(theItem);
-            }
-        }
-        #endregion

        /// <summary>
        /// just draw the rarity
@@ -169,39 +120,17 @@ namespace FModel
        public static void DrawRarity(JToken theItem, Graphics toDrawOn, string specialMode = null)
        {
            JToken seriesToken = theItem["Series"];
-            switch (Settings.Default.rarityDesign)
+            if (!string.IsNullOrEmpty(seriesToken != null ? seriesToken.Value<string>() : ""))
            {
-                case "Flat":
-                    if (!string.IsNullOrEmpty(seriesToken != null ? seriesToken.Value<string>() : ""))
-                    {
-                        DrawSeriesBackground(theItem, toDrawOn, seriesToken.Value<string>());
-                    }
-                    else if (specialMode != null)
-                    {
-                        DrawSpecialModeBackground(theItem, toDrawOn, specialMode);
-                    }
-                    else
-                    {
-                        DrawRarityBackground(theItem, toDrawOn);
-                    }
-                    break;
-                default:
-                    Image rarityBg;
-                    if (!string.IsNullOrEmpty(seriesToken != null ? seriesToken.Value<string>() : ""))
-                    {
-                        rarityBg = GetSeriesImage(theItem, seriesToken.Value<string>());
-                    }
-                    else if (specialMode != null)
-                    {
-                        rarityBg = GetSpecialModeImage(theItem, specialMode);
-                    }
-                    else
-                    {
-                        rarityBg = GetRarityImage(theItem);
-                    }
-                    toDrawOn.DrawImage(rarityBg, new Point(0, 0));
-                    break;
-
+                DrawSeriesBackground(theItem, toDrawOn, seriesToken.Value<string>());
+            }
+            else if (specialMode != null)
+            {
+                DrawSpecialModeBackground(theItem, toDrawOn, specialMode);
+            }
+            else
+            {
+                DrawRarityBackground(theItem, toDrawOn);
            }
        }
    }
--- a/FModel/Methods/IconGenerator/SchematicGenerator/SchematicIconDesign.cs
+++ b/FModel/Methods/IconGenerator/SchematicGenerator/SchematicIconDesign.cs
@@ -111,20 +111,20 @@ namespace FModel
                switch (rarity.Value<string>())
                {
                    case "EFortRarity::Transcendent":
-                        rarityColor = Color.FromArgb(255, 155, 39, 69);
+                        rarityColor = Color.FromArgb(255, 213, 25, 68);
                        break;
                    case "EFortRarity::Mythic":
-                        rarityColor = Color.FromArgb(255, 170, 143, 47);
+                        rarityColor = Color.FromArgb(255, 186, 156, 54);
                        break;
                    case "EFortRarity::Legendary":
-                        rarityColor = Color.FromArgb(255, 170, 96, 47);
+                        rarityColor = Color.FromArgb(255, 192, 106, 56);
                        break;
                    case "EFortRarity::Epic":
                    case "EFortRarity::Quality":
-                        rarityColor = Color.FromArgb(255, 96, 47, 170);
+                        rarityColor = Color.FromArgb(255, 129, 56, 194);
                        break;
                    case "EFortRarity::Rare":
-                        rarityColor = Color.FromArgb(255, 55, 92, 163);
+                        rarityColor = Color.FromArgb(255, 54, 105, 187);
                        break;
                    case "EFortRarity::Common":
                        rarityColor = Color.FromArgb(255, 109, 109, 109);
@@ -135,7 +135,7 @@ namespace FModel

            toDrawOn.FillRectangle(new SolidBrush(rarityColor), new Rectangle(0, 522 + (75 * i), schematicBitmap.Width, 75));
            Pen pen = new Pen(ControlPaint.Light(rarityColor), 4);
-            pen.Alignment = PenAlignment.Inset; //<-- this
+            pen.Alignment = PenAlignment.Inset;
            toDrawOn.DrawRectangle(pen, new Rectangle(0, 522 + (75 * i), schematicBitmap.Width, 75));
        }

--- a/FModel/Methods/Utilities/Utilities.cs
+++ b/FModel/Methods/Utilities/Utilities.cs
@@ -214,5 +214,11 @@ namespace FModel
                yield return curItem;
            }
        }
+
+        public static Color ChangeLightness(this Color color, float coef)
+        {
+            return Color.FromArgb((int)(color.R * coef), (int)(color.G * coef),
+                (int)(color.B * coef));
+        }
    }
 }
--- a/FModel/Properties/Resources.Designer.cs
+++ b/FModel/Properties/Resources.Designer.cs
@@ -90,16 +90,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap C512v1 {
-            get {
-                object obj = ResourceManager.GetObject("C512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
        /// </summary>
@@ -130,16 +120,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap E512v1 {
-            get {
-                object obj = ResourceManager.GetObject("E512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône).
        /// </summary>
@@ -180,16 +160,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap L512v1 {
-            get {
-                object obj = ResourceManager.GetObject("L512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
        /// </summary>
@@ -200,26 +170,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap M512v1 {
-            get {
-                object obj = ResourceManager.GetObject("M512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Marvel512v1 {
-            get {
-                object obj = ResourceManager.GetObject("Marvel512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
        /// </summary>
@@ -250,16 +200,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap R512v1 {
-            get {
-                object obj = ResourceManager.GetObject("R512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
        /// </summary>
@@ -280,16 +220,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap T512v1 {
-            get {
-                object obj = ResourceManager.GetObject("T512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône).
        /// </summary>
@@ -300,16 +230,6 @@ namespace FModel.Properties {
            }
        }
        
-        /// <summary>
-        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap U512v1 {
-            get {
-                object obj = ResourceManager.GetObject("U512v1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
        /// </summary>
--- a/FModel/Properties/Resources.resx
+++ b/FModel/Properties/Resources.resx
@@ -184,28 +184,4 @@
  <data name="cTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cTemplate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="C512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\C512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="E512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\E512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="L512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\L512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="M512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\M512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Marvel512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Marvel512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="R512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\R512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="T512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\T512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="U512v1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\U512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
--- a/FModel/Resources/C512v1.png
+++ b/FModel/Resources/C512v1.png
--- a/FModel/Resources/E512v1.png
+++ b/FModel/Resources/E512v1.png
--- a/FModel/Resources/L512v1.png
+++ b/FModel/Resources/L512v1.png
--- a/FModel/Resources/M512v1.png
+++ b/FModel/Resources/M512v1.png
--- a/FModel/Resources/Marvel512v1.png
+++ b/FModel/Resources/Marvel512v1.png
--- a/FModel/Resources/R512v1.png
+++ b/FModel/Resources/R512v1.png
--- a/FModel/Resources/T512v1.png
+++ b/FModel/Resources/T512v1.png
--- a/FModel/Resources/U512v1.png
+++ b/FModel/Resources/U512v1.png