Merge pull request #151 from ndsev/sourcedata-inspector

SourceData Inspector
ndsev · Aug 27, 2024 · 8b8e036 · 8b8e036
2 parents 4aefa12 + 5edecaf
commit 8b8e036
Show file tree

Hide file tree

Showing 32 changed files with 16,653 additions and 25,053 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ message("Building for ${CMAKE_SYSTEM_NAME}.")
 
 FetchContent_Declare(mapget
   GIT_REPOSITORY "https://github.com/Klebert-Engineering/mapget"
-  GIT_TAG        "v2024.3.1"
+  GIT_TAG        "main"
   GIT_SHALLOW    ON)
 FetchContent_MakeAvailable(mapget)
 

diff --git a/erdblick_app/app/app.component.ts b/erdblick_app/app/app.component.ts
@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 import {HttpClient} from "@angular/common/http";
+import {ActivatedRoute, NavigationEnd, Params, Router} from "@angular/router";
 import {JumpTargetService} from "./jump.service";
 import {MapService} from "./map.service";
-import {ActivatedRoute, NavigationEnd, Params, Router} from "@angular/router";
 import {ParametersService} from "./parameters.service";
 import {StyleService} from "./style.service";
 import {filter} from "rxjs";
@@ -14,8 +14,8 @@ import {filter} from "rxjs";
         <map-panel></map-panel>
         <p-toast position="top-center" key="tc"></p-toast>
         <search-panel #searchoverlay></search-panel>
-        <pref-components></pref-components>
         <inspection-panel></inspection-panel>
+        <pref-components></pref-components>
         <coordinates-panel></coordinates-panel>
         <div id="info">
             {{ title }} {{ version }}

diff --git a/erdblick_app/app/app.module.ts b/erdblick_app/app/app.module.ts
@@ -3,7 +3,7 @@ import {BrowserModule} from '@angular/platform-browser';
 
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
-import {HttpClientModule} from "@angular/common/http";
+import {provideHttpClient, withInterceptorsFromDi} from "@angular/common/http";
 import {SpeedDialModule} from "primeng/speeddial";
 import {DialogModule} from "primeng/dialog";
 import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
@@ -27,8 +27,11 @@ import {MapService} from "./map.service";
 import {InputSwitchModule} from "primeng/inputswitch";
 import {SliderModule} from "primeng/slider";
 import {StyleService} from "./style.service";
+import {FeatureSearchComponent} from "./feature.search.component";
 import {MapPanelComponent} from "./map.panel.component";
 import {InspectionPanelComponent} from "./inspection.panel.component";
+import {FeaturePanelComponent} from "./feature.panel.component";
+import {SourceDataPanelComponent} from "./sourcedata.panel.component";
 import {InspectionService} from "./inspection.service";
 import {ParametersService} from "./parameters.service";
 import {PreferencesComponent} from "./preferences.component";
@@ -43,12 +46,17 @@ import {SidePanelService} from "./sidepanel.service";
 import {MenuModule} from "primeng/menu";
 import {CardModule} from "primeng/card";
 import {CoordinatesService} from "./coordinates.service";
-import {FeatureSearchComponent} from "./feature.search.component";
 import {ColorPickerModule} from "primeng/colorpicker";
 import {ListboxModule} from "primeng/listbox";
 import {FeatureSearchService} from "./feature.search.service";
 import {ClipboardService} from "./clipboard.service";
 import {MultiSelectModule} from "primeng/multiselect";
+import {ButtonGroupModule} from "primeng/buttongroup";
+import {TabViewModule} from "primeng/tabview";
+import {BreadcrumbModule} from "primeng/breadcrumb";
+import {TableModule} from "primeng/table";
+import {HighlightSearch} from "./highlight.pipe";
+import {TreeTableFilterPatchDirective} from "./treetablefilter-patch.directive";
 import {InputTextareaModule} from "primeng/inputtextarea";
 
 export function initializeServices(styleService: StyleService, mapService: MapService, coordService: CoordinatesService) {
@@ -66,19 +74,25 @@ export function initializeServices(styleService: StyleService, mapService: MapSe
         SearchPanelComponent,
         MapPanelComponent,
         InspectionPanelComponent,
+        FeaturePanelComponent,
+        SourceDataPanelComponent,
         PreferencesComponent,
         EditorComponent,
         ErdblickViewComponent,
         CoordinatesPanelComponent,
         FeatureSearchComponent,
-        AlertDialogComponent
+        AlertDialogComponent,
+        HighlightSearch,
+        TreeTableFilterPatchDirective,
+    ],
+    bootstrap: [
+        AppComponent
     ],
     imports: [
         BrowserModule,
         BrowserAnimationsModule,
         AnimateModule,
         AppRoutingModule,
-        HttpClientModule,
         SpeedDialModule,
         DialogModule,
         FormsModule,
@@ -102,14 +116,18 @@ export function initializeServices(styleService: StyleService, mapService: MapSe
         ColorPickerModule,
         ListboxModule,
         MultiSelectModule,
-        InputTextareaModule
+        InputTextareaModule,
+        ButtonGroupModule,
+        TabViewModule,
+        BreadcrumbModule,
+        TableModule
     ],
     providers: [
         {
             provide: APP_INITIALIZER,
             useFactory: initializeServices,
             deps: [StyleService, MapService, CoordinatesService],
-            multi: true
+            multi: true,
         },
         MapService,
         MessageService,
@@ -119,9 +137,8 @@ export function initializeServices(styleService: StyleService, mapService: MapSe
         ParametersService,
         SidePanelService,
         FeatureSearchService,
-        ClipboardService
-    ],
-    bootstrap: [AppComponent]
-})
+        ClipboardService,
+        provideHttpClient(withInterceptorsFromDi()),
+    ] })
 export class AppModule {
 }
diff --git a/erdblick_app/app/coordinates.service.ts b/erdblick_app/app/coordinates.service.ts
@@ -53,4 +53,4 @@ export class CoordinatesService {
             }
         });
     }
-}
+}