Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SourceData Inspector #151

Merged
merged 27 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
537d579
Apply simfil Fields -> StringPool rename
johannes-wolf Jul 23, 2024
c8bc94e
Apply mapget API changes
johannes-wolf Jul 24, 2024
c716c01
Implement SourceData Support
johannes-wolf Jul 24, 2024
9e4c5fb
Make TreeTables use virtual scrolling
johannes-wolf Aug 8, 2024
c8dfa2e
Use buttons for jumping to the source data
johannes-wolf Aug 12, 2024
0a4ae0f
Put Feature and SourceData Inspector into common panel
johannes-wolf Aug 14, 2024
7cb24b0
Use mapget main
johannes-wolf Aug 16, 2024
118e23c
Fix SourceData inspector styling
johannes-wolf Aug 16, 2024
34e528a
Rename service source data signal
johannes-wolf Aug 16, 2024
ed521d5
Rebase fixups
johannes-wolf Aug 16, 2024
48e2a5f
Fix evaluateExpression.
josephbirkner Aug 20, 2024
58d8056
Filter out SourceData layers
johannes-wolf Aug 21, 2024
dc3779c
Fix SourceData range matching
johannes-wolf Aug 21, 2024
aa0060b
Fix URL handling for SourceData
johannes-wolf Aug 21, 2024
e735383
Fix URL handling for SourceData layers (finally)
johannes-wolf Aug 21, 2024
a26502c
Fix documentation URL for certain zserio types
johannes-wolf Aug 22, 2024
e7a11ab
Fix TreeTable scrolling & refreshing
johannes-wolf Aug 22, 2024
8107864
Bump angular version
johannes-wolf Aug 22, 2024
12af92f
Use patched primeng version
johannes-wolf Aug 22, 2024
b973613
Fix table row-recalculation on panel switch
johannes-wolf Aug 23, 2024
e667311
Fix feature-inspector popup-menu placement bug
johannes-wolf Aug 23, 2024
027fb70
SourceDataInspector: Support Resizable Columns
johannes-wolf Aug 23, 2024
e577ae8
Bindings: Refine Comments
johannes-wolf Aug 23, 2024
13ef69b
Test if layer is null
johannes-wolf Aug 26, 2024
8fd5e97
Remove unused LayerType
johannes-wolf Aug 26, 2024
3713daf
Add newline
johannes-wolf Aug 26, 2024
5edecaf
Move source-data bindings to separate file
johannes-wolf Aug 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions erdblick_app/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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 }}
Expand Down
37 changes: 27 additions & 10 deletions erdblick_app/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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) {
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -119,9 +137,8 @@ export function initializeServices(styleService: StyleService, mapService: MapSe
ParametersService,
SidePanelService,
FeatureSearchService,
ClipboardService
],
bootstrap: [AppComponent]
})
ClipboardService,
provideHttpClient(withInterceptorsFromDi()),
] })
export class AppModule {
}
2 changes: 1 addition & 1 deletion erdblick_app/app/coordinates.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ export class CoordinatesService {
}
});
}
}
}
Loading
Loading