Skip to content

Commit 5e868d3

Browse files
EMS90EMS90
EMS90
authored and
EMS90
committed
Modification to new egbt lib API using strings for CRS definitions
1 parent 5c2645e commit 5e868d3

File tree

2 files changed

+62
-40
lines changed

2 files changed

+62
-40
lines changed

TRA.Tool/TransformPanel.Designer.cs

Lines changed: 51 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TRA.Tool/TransformPanel.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ public TransformPanel() : base()
2929
InitializeComponent();
3030

3131
this.label_Panel.Text = "Transform";
32-
comboBox_TransformFrom.DataSource = Enum.GetValues(typeof(egbt22lib.Convert.CRS));
33-
comboBox_TransformTo.DataSource = Enum.GetValues(typeof(egbt22lib.Convert.CRS));
34-
comboBox_TransformFrom.SelectedItem = egbt22lib.Convert.CRS.DB_Ref_GK5;
35-
comboBox_TransformTo.SelectedItem = egbt22lib.Convert.CRS.ETRS89_EGBT22_LDP;
32+
comboBox_TransformFrom.DataSource = new BindingList<string>(egbt22lib.Convert.Defined_CRS);
33+
comboBox_TransformFromVCS.DataSource = egbt22lib.Convert.Defined_VRS;
34+
comboBox_TransformTo.DataSource = new BindingList<string>(egbt22lib.Convert.Defined_CRS);
35+
comboBox_TransformFrom.SelectedIndex = 4;
36+
comboBox_TransformTo.SelectedItem = 0;
3637
comboBox_TransformFrom.SelectedIndexChanged += comboBox_Transform_SelectedIndexChanged;
3738
comboBox_TransformTo.SelectedIndexChanged += comboBox_Transform_SelectedIndexChanged;
38-
comboBox_Transform_SelectedIndexChanged(this,EventArgs.Empty);
39+
comboBox_Transform_SelectedIndexChanged(this, EventArgs.Empty);
3940
}
4041
private TransformSetup transformSetup;
4142
internal override TransformSetup GetTransformSetup()
@@ -46,11 +47,12 @@ internal override TransformSetup GetTransformSetup()
4647

4748
private void comboBox_Transform_SelectedIndexChanged(object sender, EventArgs e)
4849
{
49-
if(comboBox_TransformFrom.SelectedItem == null || comboBox_TransformTo.SelectedItem == null) return;
50-
egbt22lib.Convert.CRS CRSFrom = (egbt22lib.Convert.CRS)comboBox_TransformFrom.SelectedItem;
51-
egbt22lib.Convert.CRS CRSTo = (egbt22lib.Convert.CRS)comboBox_TransformTo.SelectedItem;
50+
if (comboBox_TransformFrom.SelectedItem == null || comboBox_TransformTo.SelectedItem == null) return;
51+
string CRSFrom = (string)comboBox_TransformFrom.SelectedItem;
52+
string CRSFromVCS = comboBox_TransformFromVCS.SelectedItem != null ? (string)comboBox_TransformFromVCS.SelectedItem : "";
53+
string CRSTo = (string)comboBox_TransformTo.SelectedItem;
5254
string info;
53-
bool result = egbt22lib.Convert.GetConversion(CRSFrom, CRSTo,out transformSetup.ConvertFunc, out info, true)
55+
bool result = egbt22lib.Convert.GetConversion(CRSFrom, CRSTo, out transformSetup.ConvertFunc, out info, true)
5456
&& egbt22lib.Convert.GetGammaKCalculation(CRSFrom, out transformSetup.GammaK_From)
5557
&& egbt22lib.Convert.GetGammaKCalculation(CRSTo, out transformSetup.GammaK_To);
5658
toolTip.SetToolTip(comboBox_TransformFrom, info);

0 commit comments

Comments
 (0)