Skip to content

Commit

Permalink
PUS7502 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@onka13
onka13 committed Jan 21, 2018
1 parent 355b8e4 commit 192b7ba
Show file tree
Hide file tree
Showing 7 changed files with 157 additions and 34 deletions.
8 changes: 8 additions & 0 deletions OnkaPhilipsChannelEditor/FormMain.Designer.cs
View file

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

26 changes: 22 additions & 4 deletions OnkaPhilipsChannelEditor/FormMain.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
var channel = listBox1.SelectedItem as ChannelMapChannel;
txtNo.Text = channel.Setup.ChannelNumber.ToString();
txtFavoriteNo.Text = channel.Setup.FavoriteNumber.ToString();
txtName.Text = OnkaHelper.GetChannelName(channel.Setup.ChannelName);
var cName = OnkaHelper.GetChannelName(channel.Setup.ChannelName);
txtName.Text = cName.Name;
lblChannelSuffix.Text = cName.Suffix;
}

private void btnChange_Click(object sender, EventArgs e)
Expand All @@ -110,7 +112,9 @@ private void btnChange_Click(object sender, EventArgs e)

channel.Setup.ChannelNumber = newNo;
channel.Setup.FavoriteNumber = Convert.ToByte(txtFavoriteNo.Text);
channel.Setup.ChannelName = OnkaHelper.SetChannelName(txtName.Text);
var cName = OnkaHelper.GetChannelName(channel.Setup.ChannelName);
cName.Name = txtName.Text;
channel.Setup.ChannelName = OnkaHelper.SetChannelName(cName);

ReBindList(listBox1.SelectedIndex, channel);

Expand All @@ -125,12 +129,26 @@ private void sortByNoToolStripMenuItem_Click(object sender, EventArgs e)

private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (root == null || root.Channel == null || root.Channel.Length == 0) return;

SaveFileDialog dialog = new SaveFileDialog();
if (dialog.ShowDialog() != DialogResult.OK)
{
return;
}
var serializer = new XmlSerializer(typeof(ChannelMap));

XmlAttributeOverrides overrides = new XmlAttributeOverrides();

var channel = root.Channel.FirstOrDefault();
if (channel.Setup._niceChannelName.SuffixLength == 0)
{
XmlAttributes attribs = new XmlAttributes();
attribs.XmlIgnore = true;
attribs.XmlElements.Add(new XmlElementAttribute("UniqueID"));
overrides.Add(typeof(ChannelMapChannelBroadcast), "UniqueID", attribs);
}

var serializer = new XmlSerializer(typeof(ChannelMap), overrides);

XmlWriterSettings settings = new XmlWriterSettings
{
Expand Down Expand Up @@ -158,7 +176,7 @@ private void saveToolStripMenuItem_Click(object sender, EventArgs e)

private void textBox1_TextChanged(object sender, EventArgs e)
{
listBox1.DataSource = root.Channel.Where(x => x.Setup._niceChannelName.Contains(txtSearch.Text)).ToList();
listBox1.DataSource = root.Channel.Where(x => x.Setup._niceChannelName.Name.Contains(txtSearch.Text)).ToList();
}

private void orderAllReNumberToolStripMenuItem_Click(object sender, EventArgs e)
Expand Down
52 changes: 38 additions & 14 deletions OnkaPhilipsChannelEditor/FormMain.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,35 @@
<data name="splitContainer2.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
<value>Horizontal</value>
</data>
<data name="lblChannelSuffix.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblChannelSuffix.Location" type="System.Drawing.Point, System.Drawing">
<value>361, 130</value>
</data>
<data name="lblChannelSuffix.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 17</value>
</data>
<data name="lblChannelSuffix.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;lblChannelSuffix.Name" xml:space="preserve">
<value>lblChannelSuffix</value>
</data>
<data name="&gt;&gt;lblChannelSuffix.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblChannelSuffix.Parent" xml:space="preserve">
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;lblChannelSuffix.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="cAutoSort.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cAutoSort.Location" type="System.Drawing.Point, System.Drawing">
<value>410, 24</value>
<value>507, 23</value>
</data>
<data name="cAutoSort.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 21</value>
Expand All @@ -381,10 +405,10 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;cAutoSort.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="btnChange.Location" type="System.Drawing.Point, System.Drawing">
<value>424, 77</value>
<value>521, 77</value>
</data>
<data name="btnChange.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 70</value>
Expand All @@ -405,10 +429,10 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;btnChange.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="btnDeleteChannel.Location" type="System.Drawing.Point, System.Drawing">
<value>424, 153</value>
<value>521, 155</value>
</data>
<data name="btnDeleteChannel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 70</value>
Expand All @@ -429,7 +453,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;btnDeleteChannel.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="txtNo.Location" type="System.Drawing.Point, System.Drawing">
<value>122, 81</value>
Expand All @@ -450,7 +474,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;txtNo.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="txtFavoriteNo.Location" type="System.Drawing.Point, System.Drawing">
<value>122, 179</value>
Expand All @@ -474,7 +498,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;txtFavoriteNo.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand All @@ -501,7 +525,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand All @@ -528,7 +552,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="txtName.Location" type="System.Drawing.Point, System.Drawing">
<value>122, 126</value>
Expand All @@ -537,7 +561,7 @@
<value>24</value>
</data>
<data name="txtName.Size" type="System.Drawing.Size, System.Drawing">
<value>268, 22</value>
<value>232, 22</value>
</data>
<data name="txtName.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand All @@ -552,7 +576,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;txtName.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand All @@ -579,7 +603,7 @@
<value>splitContainer2.Panel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="&gt;&gt;splitContainer2.Panel1.Name" xml:space="preserve">
<value>splitContainer2.Panel1</value>
Expand Down Expand Up @@ -762,7 +786,7 @@
<value>Language</value>
</data>
<data name="aboutToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 26</value>
<value>125, 26</value>
</data>
<data name="aboutToolStripMenuItem.Text" xml:space="preserve">
<value>About</value>
Expand Down
36 changes: 33 additions & 3 deletions OnkaPhilipsChannelEditor/Models.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@

namespace OnkaPhilipsChannelEditor
{
public class OnkaChannelName
{
public string Name { get; set; }
public string Suffix { get; set; }
public int NameLength { get; set; }
public int SuffixLength { get; set; }

public override string ToString()
{
return Name;
}
}
/*
public class ChannelMapModel
{
Expand Down Expand Up @@ -182,12 +194,15 @@ public string ChannelName
set
{
this.channelNameField = value;
_niceChannelName = OnkaHelper.GetChannelName(channelNameField).ToLowerInvariant();
_niceChannelName = OnkaHelper.GetChannelName(channelNameField);
}
}
[System.Xml.Serialization.XmlIgnore]
public string _niceChannelName = "";

public OnkaChannelName _niceChannelName = new OnkaChannelName();

[System.Xml.Serialization.XmlIgnore]
public string _ChannelNameSuffix = "";

/// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
public byte ChannelLock
Expand Down Expand Up @@ -293,6 +308,7 @@ public byte FavoriteNumber
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)]
public partial class ChannelMapChannelBroadcast
{
private int uniqueIDField;

private byte channelTypeField;

Expand All @@ -316,6 +332,20 @@ public partial class ChannelMapChannelBroadcast

private byte systemHiddenField;

/// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
public int UniqueID
{
get
{
return this.uniqueIDField;
}
set
{
this.uniqueIDField = value;
}
}

/// <remarks/>
[System.Xml.Serialization.XmlAttributeAttribute()]
public byte ChannelType
Expand Down
Loading

0 comments on commit 192b7ba

Please sign in to comment.