Skip to content

Commit 057798c

Browse files
nemethviktornemethviktor
committed
Eliminate ObjectMapping (XLSM/SQLITE) logic
1 parent d533846 commit 057798c

20 files changed

Lines changed: 668 additions & 614 deletions

‎FrmEditFileData.cs‎

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

‎FrmMainApp.cs‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ private async void FrmMainApp_Load(object sender,
254254
// Setup the List View
255255
try
256256
{
257-
lvw_FileList.ReadAndApplySetting(appLanguage: AppLanguage, objectNames: HelperVariables.DtObjectNames);
257+
lvw_FileList.ReadAndApplySetting(appLanguage: AppLanguage);
258258
}
259259
catch (Exception ex)
260260
{
@@ -506,9 +506,9 @@ private async void btn_loctToFile_Click(object sender,
506506
{
507507
foreach (ListViewItem lvi in lvw_FileList.SelectedItems)
508508
{
509-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
510-
.Index]
511-
.Text);
509+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
510+
.Index]
511+
.Text);
512512
// don't do folders...
513513
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
514514
{
@@ -577,9 +577,9 @@ private async void btn_loctToFile_Click(object sender,
577577
HelperGenericFileLocking.FileListBeingUpdated = true;
578578
foreach (ListViewItem lvi in lvw_FileList.SelectedItems)
579579
{
580-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
581-
.Index]
582-
.Text);
580+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
581+
.Index]
582+
.Text);
583583
// don't do folders...
584584
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
585585
{
@@ -1079,9 +1079,9 @@ private async void tsb_GetAllFromWeb_Click(object sender,
10791079
{
10801080
foreach (ListViewItem lvi in frmMainAppInstance.lvw_FileList.SelectedItems)
10811081
{
1082-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw.Columns[key: "clh_GUID"]
1083-
.Index]
1084-
.Text);
1082+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw.Columns[key: "clh_GUID"]
1083+
.Index]
1084+
.Text);
10851085
// don't do folders...
10861086
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
10871087
{
@@ -1244,9 +1244,9 @@ private void tsb_ImportGPX_Click(object sender,
12441244
bool validFilesToImport = false;
12451245
foreach (ListViewItem lvi in lvw_FileList.SelectedItems)
12461246
{
1247-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1248-
.Index]
1249-
.Text);
1247+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1248+
.Index]
1249+
.Text);
12501250
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
12511251
{
12521252
validFilesToImport = true;
@@ -1339,9 +1339,9 @@ private void lvw_FileList_UpdateTagsFromWeb(string strGpsLatitude,
13391339
{
13401340
if (!_StopProcessingRows)
13411341
{
1342-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1343-
.Index]
1344-
.Text);
1342+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1343+
.Index]
1344+
.Text);
13451345
string fileNameWithoutPath = dirElemFileToModify.ItemNameWithoutPath;
13461346

13471347
HelperVariables.CurrentAltitude = null;
@@ -1688,9 +1688,9 @@ private async Task lvw_HandleSelectionChange()
16881688
if (lvw_FileList.SelectedItems.Count > 0)
16891689
{
16901690
ListViewItem lvi = lvw_FileList.SelectedItems[index: 0];
1691-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1692-
.Index]
1693-
.Text);
1691+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1692+
.Index]
1693+
.Text);
16941694
string fileNameWithPath = dirElemFileToModify.FileNameWithPath;
16951695

16961696
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
@@ -1800,9 +1800,9 @@ private async void lvw_FileList_KeyDown(object sender,
18001800
if (lvw_FileList.SelectedItems.Count == 1)
18011801
{
18021802
ListViewItem lvi = lvw_FileList.SelectedItems[index: 0];
1803-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1804-
.Index]
1805-
.Text);
1803+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
1804+
.Index]
1805+
.Text);
18061806

18071807
// if .. (parent) then do a folder-up
18081808
if (dirElemFileToModify.Type == DirectoryElement.ElementType.ParentDirectory)
@@ -2056,9 +2056,9 @@ where dataRow.Field<string>(columnName: "favouriteName") == favouriteToLoad
20562056
{
20572057
foreach (ListViewItem lvi in lvw_FileList.SelectedItems)
20582058
{
2059-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
2060-
.Index]
2061-
.Text);
2059+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
2060+
.Index]
2061+
.Text);
20622062
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
20632063
{
20642064
filesAreSelected = true;
@@ -2071,9 +2071,9 @@ where dataRow.Field<string>(columnName: "favouriteName") == favouriteToLoad
20712071
{
20722072
foreach (ListViewItem lvi in lvw_FileList.SelectedItems)
20732073
{
2074-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
2075-
.Index]
2076-
.Text);
2074+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw_FileList.Columns[key: "clh_GUID"]
2075+
.Index]
2076+
.Text);
20772077
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
20782078
{
20792079
foreach (ElementAttribute attribute in HelperGenericAncillaryListsArrays.GetFavouriteTags())
@@ -2261,9 +2261,9 @@ private void tmi_OpenCoordsInAPI_Click(object sender,
22612261
if (lvw.SelectedItems.Count == 1)
22622262
{
22632263
ListViewItem lvi = lvw_FileList.SelectedItems[index: 0];
2264-
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemUniqueID(UniqueID: lvi.SubItems[index: lvw.Columns[key: "clh_GUID"]
2265-
.Index]
2266-
.Text);
2264+
DirectoryElement dirElemFileToModify = DirectoryElements.FindElementByItemGUID(GUID: lvi.SubItems[index: lvw.Columns[key: "clh_GUID"]
2265+
.Index]
2266+
.Text);
22672267
if (dirElemFileToModify.Type == DirectoryElement.ElementType.File)
22682268
{
22692269
latParseSuccess = double.TryParse(s: lvi.SubItems[index: lvw.Columns[key: "clh_GPSLatitude"]

0 commit comments

Comments
 (0)