Commit 00d8d825 authored by Matthias Betz's avatar Matthias Betz
Browse files

fixed object library, moving category to tooltip, for more concise library

parent 2d19a90f
...@@ -516,15 +516,10 @@ export default function smartVillagesPlugin(config, baseUrl) { ...@@ -516,15 +516,10 @@ export default function smartVillagesPlugin(config, baseUrl) {
objectUrl = model.url; objectUrl = model.url;
} }
} else { } else {
app.notifier.add({ missingModels.push(loadingObject.name);
type: NotificationType.ERROR, // go to next model
message: continue;
'Objekt mit dem namen: ' +
loadingObject.name +
' konnte nicht in den geladenen Objekten gefunden werden. Konfiguration konnte nicht vollständig geladen werden.',
});
// abort
return;
} }
} }
const cartPos = Cartesian3.fromDegrees( const cartPos = Cartesian3.fromDegrees(
......
...@@ -7,27 +7,31 @@ ...@@ -7,27 +7,31 @@
</template> </template>
<template #default> <template #default>
<v-expansion-panels multiple> <v-expansion-panels multiple>
<VcsExpansionPanel v-for="(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName"> <VcsExpansionPanel v-for = "(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName" >
<v-container v-for="(entries, subCategory) in subcats" :key="subCategory" class=" py-1 px-1 border-b-md"> <v-container class="px-1 py-0">
<v-col class="list-col"> <v-row class="v-row--no-gutters">
<VcsLabel class="mb-4 text-h2">{{ subCategory }}</VcsLabel> <template v-for="(entries, subCategory) in subcats" :key = "subCategory">
<v-list class="no-scroll"> <vcs-button
<v-row> v-for="entry in entries"
<vcs-button v-for="entry in entries" :key="entry.title" @click="placeCatalogModel(entry.model)" :key="entry.title"
class="p-0 mx-1 my-0 border gc-2" @click="placeCatalogModel(entry.model)"
style="width: auto; height: auto; margin-left: 1rem; margin-bottom: 1px;" variant="filled"> class="p-0 mx-1 my-1 border gc-2"
<img :src="entry.icon" :alt="entry.icon" style="width: 66px; height: 66px; margin-left: 1rem; margin-bottom: 1px;"
style="display: block; max-width: 100%; max-height: 100%;" /> color="base-lighter-4"
</vcs-button> variant="tonal"
</v-row> :tooltip="getEntryTooltip(entry, subCategory)"
</v-list> >
</v-col> <img :src="entry.icon" :alt="entry.icon" style="display: block; width: 64px; height: 64px;" />
<v-divider /> </vcs-button>
<v-divider/>
</template>
</v-row>
</v-container> </v-container>
</VcsExpansionPanel> </VcsExpansionPanel>
</v-expansion-panels> </v-expansion-panels>
</template> </template>
</VcsFormSection> </VcsFormSection>
<VcsFormSection heading="Objektliste"> <VcsFormSection heading="Objektliste">
<template #help> <template #help>
...@@ -212,6 +216,16 @@ async function retrieveCatalogJson(link) { ...@@ -212,6 +216,16 @@ async function retrieveCatalogJson(link) {
} }
} }
export function getEntryTooltip (entry, subcategory) {
let tooltip = '';
const category = subcategory || 'Unbekannt';
tooltip += category;
return tooltip;
}
function getCatalogEntries(json, linkPrefix) { function getCatalogEntries(json, linkPrefix) {
const part = {}; const part = {};
...@@ -578,6 +592,10 @@ export default { ...@@ -578,6 +592,10 @@ export default {
saveConfiguration() { saveConfiguration() {
saveObjects(); saveObjects();
}, },
getEntryTooltip(entry, subcategory) {
return getEntryTooltip(entry, subcategory);
},
}; };
}, },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment