corrade-vassal – Diff between revs 8 and 13
?pathlinks?
Rev 8 | Rev 13 | |||
---|---|---|---|---|
Line 11... | Line 11... | |||
11 | using System.Linq; |
11 | using System.Linq; |
|
12 | using System.Text; |
12 | using System.Text; |
|
13 | using System.Threading; |
13 | using System.Threading; |
|
14 | using System.Windows.Forms; |
14 | using System.Windows.Forms; |
|
15 | using OpenMetaverse; |
15 | using OpenMetaverse; |
|
- | 16 | using wasSharp; |
||
Line 16... | Line 17... | |||
16 | |
17 | |
|
17 | namespace Vassal |
18 | namespace Vassal |
|
18 | { |
19 | { |
|
19 | public partial class RegionEditForm : Form |
20 | public partial class RegionEditForm : Form |
|
Line 47... | Line 48... | |||
47 | Vector3 localPosition; |
48 | Vector3 localPosition; |
|
48 | List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List |
49 | List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List |
|
49 | <KeyValuePair<string, Vector3>>( |
50 | <KeyValuePair<string, Vector3>>( |
|
50 | File.ReadAllLines(file) |
51 | File.ReadAllLines(file) |
|
51 | .AsParallel() |
52 | .AsParallel() |
|
52 | .Select(o => new List<string>(Vassal.wasCSVToEnumerable(o))) |
53 | .Select(o => new List<string>(CSV.ToEnumerable(o))) |
|
53 | .Where(o => o.Count == 2) |
54 | .Where(o => o.Count == 2) |
|
54 | .ToDictionary(o => o.First(), |
55 | .ToDictionary(o => o.First(), |
|
55 | p => |
56 | p => |
|
56 | Vector3.TryParse(p.Last(), out localPosition) |
57 | Vector3.TryParse(p.Last(), out localPosition) |
|
57 | ? localPosition |
58 | ? localPosition |
|
Line 134... | Line 135... | |||
134 | KeyValuePair<string, Vector3> region in |
135 | KeyValuePair<string, Vector3> region in |
|
135 | Regions.Items.Cast<ListViewItem>() |
136 | Regions.Items.Cast<ListViewItem>() |
|
136 | .Select(o => (KeyValuePair<string, Vector3>) o.Tag)) |
137 | .Select(o => (KeyValuePair<string, Vector3>) o.Tag)) |
|
137 | { |
138 | { |
|
138 | streamWriter.Write( |
139 | streamWriter.Write( |
|
139 | Vassal.wasEnumerableToCSV(new[] {region.Key, region.Value.ToString()})); |
140 | CSV.FromEnumerable(new[] {region.Key, region.Value.ToString()})); |
|
140 | streamWriter.Write(Environment.NewLine); |
141 | streamWriter.Write(Environment.NewLine); |
|
141 | } |
142 | } |
|
142 | } |
143 | } |
|
Line 143... | Line 144... | |||
143 | |
144 | |
|
Line 163... | Line 164... | |||
163 | if (File.Exists(Vassal.VASSAL_CONSTANTS.VASSAL_REGIONS)) |
164 | if (File.Exists(Vassal.VASSAL_CONSTANTS.VASSAL_REGIONS)) |
|
164 | { |
165 | { |
|
165 | Vector3 localPosition; |
166 | Vector3 localPosition; |
|
166 | List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List<KeyValuePair<string, Vector3>>( |
167 | List<KeyValuePair<string, Vector3>> ConfiguredRegions = new List<KeyValuePair<string, Vector3>>( |
|
167 | File.ReadAllLines(Vassal.VASSAL_CONSTANTS.VASSAL_REGIONS) |
168 | File.ReadAllLines(Vassal.VASSAL_CONSTANTS.VASSAL_REGIONS) |
|
168 | .Select(o => new List<string>(Vassal.wasCSVToEnumerable(o))) |
169 | .Select(o => new List<string>(CSV.ToEnumerable(o))) |
|
169 | .Where(o => o.Count == 2) |
170 | .Where(o => o.Count == 2) |
|
170 | .ToDictionary(o => o.First(), |
171 | .ToDictionary(o => o.First(), |
|
171 | p => |
172 | p => |
|
172 | Vector3.TryParse(p.Last(), out localPosition) |
173 | Vector3.TryParse(p.Last(), out localPosition) |
|
173 | ? localPosition |
174 | ? localPosition |