Skip to content

Commit

Permalink
+working on HSV slider popup
Browse files Browse the repository at this point in the history
  • Loading branch information
bahstrike committed Mar 13, 2022
1 parent 596aa1f commit b97fce6
Show file tree
Hide file tree
Showing 7 changed files with 268 additions and 5 deletions.
13 changes: 13 additions & 0 deletions DyeAtlas.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions DyeAtlas.cs
Original file line number Diff line number Diff line change
Expand Up @@ -413,5 +413,20 @@ public static double distance(double alpha, double beta)
}
}
#endregion

private void hsvcompareButton_Click(object sender, EventArgs e)
{
HSVSlidersPopup popup = new HSVSlidersPopup(this);

// manual spawn location for dialog.. right next to button
popup.Location = PointToScreen(hsvcompareButton.Location + new Size(hsvcompareButton.Width, 0));


// kill the button; it will re-enable when they close popup
hsvcompareButton.Enabled = false;

// non-modal; let it live
popup.Show(this);
}
}
}
9 changes: 9 additions & 0 deletions DyeAtlas.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@
<Compile Include="DyeAtlas.Designer.cs">
<DependentUpon>DyeAtlas.cs</DependentUpon>
</Compile>
<Compile Include="HSVSlidersPopup.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="HSVSlidersPopup.Designer.cs">
<DependentUpon>HSVSlidersPopup.cs</DependentUpon>
</Compile>
<Compile Include="Palette.cs" />
<Compile Include="PNTImage.cs" />
<Compile Include="Program.cs" />
Expand All @@ -60,6 +66,9 @@
<EmbeddedResource Include="DyeAtlas.resx">
<DependentUpon>DyeAtlas.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="HSVSlidersPopup.resx">
<DependentUpon>HSVSlidersPopup.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
Expand Down
72 changes: 72 additions & 0 deletions HSVSlidersPopup.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions HSVSlidersPopup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace DyeAtlas
{
public partial class HSVSlidersPopup : Form
{
public readonly DyeAtlas dyeAtlas;

public HSVSlidersPopup(DyeAtlas _dyeAtlas)
{
dyeAtlas = _dyeAtlas;

InitializeComponent();
}

private void HSVSlidersPopup_FormClosed(object sender, FormClosedEventArgs e)
{
// re-enable popup button again
dyeAtlas.hsvcompareButton.Enabled = true;
}
}
}
120 changes: 120 additions & 0 deletions HSVSlidersPopup.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
14 changes: 9 additions & 5 deletions Palette.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,17 @@ public int FindClosestIndex(Color clr, bool hsvCompare)
double valDiff = Math.Abs(aVal - bVal);

// weights
hueDiff *= 1.0;
satDiff *= 1.0;
valDiff *= 1.0;
hueDiff *= 1.5;
satDiff *= 1.7;
valDiff *= 1.4;


//quantize, i guess
diff = (int)Math.Round(hueDiff * 100.0) +
// RGB compare; seems to be a good baseline
diff = Math.Abs(pe.color.R - clr.R) + Math.Abs(pe.color.G - clr.G) + Math.Abs(pe.color.B - clr.B);


// influence with HSV diffs
diff += (int)Math.Round(hueDiff * 100.0) +
(int)Math.Round(satDiff * 100.0) +
(int)Math.Round(valDiff * 100.0);
}
Expand Down

0 comments on commit b97fce6

Please sign in to comment.