Commit bf666c10 authored by JoyJ's avatar JoyJ

...历 史 遗 留 问 题

parent 5c237791
Pipeline #81 passed with stage
in 1 minute and 59 seconds
...@@ -308,109 +308,31 @@ void InitPath(string datapath) ...@@ -308,109 +308,31 @@ void InitPath(string datapath)
//初始化控件 //初始化控件
public void InitControl(DataConfig datacfg) public void InitControl(DataConfig datacfg)
{ {
//为了进行错误定位而进行改造 190324 by JoyJ
if (datacfg == null) if (datacfg == null)
{ {
return; return;
} }
List<long> setcodes = DataManager.GetKeys(datacfg.dicSetnames);
string[] setnames = DataManager.GetValues(datacfg.dicSetnames);
try try
{ {
this.InitComboBox(this.cb_cardrace, datacfg.dicCardRaces); this.InitComboBox(this.cb_cardrace, datacfg.dicCardRaces);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_cardrace");
}
try
{
this.InitComboBox(this.cb_cardattribute, datacfg.dicCardAttributes); this.InitComboBox(this.cb_cardattribute, datacfg.dicCardAttributes);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_cardattribute");
}
try
{
this.InitComboBox(this.cb_cardrule, datacfg.dicCardRules); this.InitComboBox(this.cb_cardrule, datacfg.dicCardRules);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_cardrule");
}
try
{
this.InitComboBox(this.cb_cardlevel, datacfg.dicCardLevels); this.InitComboBox(this.cb_cardlevel, datacfg.dicCardLevels);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_cardlevel");
}
try
{
this.InitCheckPanel(this.pl_cardtype, datacfg.dicCardTypes); this.InitCheckPanel(this.pl_cardtype, datacfg.dicCardTypes);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-pl_cardtype");
}
try
{
this.InitCheckPanel(this.pl_markers, datacfg.dicLinkMarkers); this.InitCheckPanel(this.pl_markers, datacfg.dicLinkMarkers);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-pl_markers");
}
try
{
this.InitCheckPanel(this.pl_category, datacfg.dicCardcategorys); this.InitCheckPanel(this.pl_category, datacfg.dicCardcategorys);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-pl_category");
}
try
{
this.SetEnabled(this.pl_markers, false); this.SetEnabled(this.pl_markers, false);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-pl_markers");
}
List<long> setcodes = DataManager.GetKeys(datacfg.dicSetnames);
string[] setnames = DataManager.GetValues(datacfg.dicSetnames);
try
{
this.InitComboBox(this.cb_setname1, setcodes, setnames); this.InitComboBox(this.cb_setname1, setcodes, setnames);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_setname1");
}
try
{
this.InitComboBox(this.cb_setname2, setcodes, setnames); this.InitComboBox(this.cb_setname2, setcodes, setnames);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_setname2");
}
try
{
this.InitComboBox(this.cb_setname3, setcodes, setnames); this.InitComboBox(this.cb_setname3, setcodes, setnames);
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "启动错误-cb_setname3");
}
try
{
this.InitComboBox(this.cb_setname4, setcodes, setnames); this.InitComboBox(this.cb_setname4, setcodes, setnames);
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show(ex.ToString(), "启动错误-cb_setname4"); MessageBox.Show(ex.ToString(), "启动错误");
} }
} }
//初始化FlowLayoutPanel //初始化FlowLayoutPanel
...@@ -440,7 +362,6 @@ void InitCheckPanel(FlowLayoutPanel fpanel, Dictionary<long, string> dic) ...@@ -440,7 +362,6 @@ void InitCheckPanel(FlowLayoutPanel fpanel, Dictionary<long, string> dic)
AutoSize = true, AutoSize = true,
Margin = fpanel.Margin Margin = fpanel.Margin
}; };
_cbox.CheckedChanged += this._cbox_CheckedChanged;
//_cbox.Click += PanelOnCheckClick; //_cbox.Click += PanelOnCheckClick;
fpanel.Controls.Add(_cbox); fpanel.Controls.Add(_cbox);
} }
...@@ -449,11 +370,6 @@ void InitCheckPanel(FlowLayoutPanel fpanel, Dictionary<long, string> dic) ...@@ -449,11 +370,6 @@ void InitCheckPanel(FlowLayoutPanel fpanel, Dictionary<long, string> dic)
fpanel.PerformLayout(); fpanel.PerformLayout();
} }
private void _cbox_CheckedChanged(object sender, EventArgs e)
{
}
//初始化ComboBox //初始化ComboBox
void InitComboBox(ComboBox cb, Dictionary<long, string> tempdic) void InitComboBox(ComboBox cb, Dictionary<long, string> tempdic)
{ {
...@@ -465,7 +381,6 @@ void InitComboBox(ComboBox cb, List<long> keys, string[] values) ...@@ -465,7 +381,6 @@ void InitComboBox(ComboBox cb, List<long> keys, string[] values)
{ {
cb.Items.Clear(); cb.Items.Clear();
cb.Tag = keys; cb.Tag = keys;
//Improve 190324 by JoyJ
cb.Items.AddRange(values); cb.Items.AddRange(values);
if (cb.Items.Count > 0) if (cb.Items.Count > 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment