Commit 854c2f97 authored by Anton Koch's avatar Anton Koch

Merge branch '302-mosys---not-appearing-timelines' into 'master'

brought back disappeared timelines in source-editor (#302)

See merge request !23
parents 2b2493e2 b4a7a7f2
Pipeline #29724 passed with stage
in 1 minute and 7 seconds
......@@ -58,13 +58,14 @@
// q-item.q-pa-none(v-if="['CellMedia', 'CellAnnotationList'].includes(cell.component)")
q-item.q-pa-none.q-mt-md(v-if="cell.configuration._value.component === 'CellMedia' || cell.configuration._value.component === 'CellAnnotationList'")
//----- media
q-btn.bg-primary.text-white.media-button(@click="", flat)
q-icon(name="local movies", size="22px")
//
//----- media
q-btn.bg-primary.text-white.media-button(@click="", flat)
q-icon(name="local movies", size="22px")
//----- annotations
q-btn.bg-primary.text-white.media-button.q-ml-sm(@click="", flat)
q-icon(name="comment", size="22px")
//----- annotations
q-btn.bg-primary.text-white.media-button.q-ml-sm(@click="", flat)
q-icon(name="comment", size="22px")
// q-item(v-else)
q-field This cell type is not supported yet: {{ cell.component }}.{{ spec.path }}
......
......@@ -1019,7 +1019,7 @@
// ----- existing cell
if (obj.id) {
const parsed = obj.target.selector._value
console.log('anno style', obj, parsed)
// console.log('anno style', obj, parsed)
x = parsed.xywh[0]
y = parsed.xywh[1]
w = parsed.xywh[2]
......
......@@ -52,7 +52,8 @@
markdown-display(:content="annotation.body.value", :options="mdOptions")
template(v-else)
strong Loading annotations
q-spinner.q-ma-sm.text-white
// strong Loading annotations
//-------------------------------------------------------------------------------------------------------- edit mode
template(v-else)
......@@ -97,7 +98,7 @@ export default {
}
},
async mounted () {
this.video = await this.$store.dispatch('annotations/get', this.cell.source.id)
this.video = await this.$store.dispatch('annotations/get', this.cell.source._value.id)
this.videoTime = DateTime.fromMillis(this.video.target.selector._valueMillis)
try {
const meta = await this.$store.dispatch('metadata/get', this.video)
......
......@@ -65,15 +65,17 @@
}
},
async mounted () {
if (this.cell && this.cell.data.id) {
this.video = await this.$store.dispatch('annotations/get', this.cell.source.id)
// if (this.cell && this.cell.data.id) {
if (this.cell && this.cell.id) {
// this.video = await this.$store.dispatch('annotations/get', this.cell.source.id)
this.video = await this.$store.dispatch('annotations/get', this.cell.source._value.id)
if (this.video) {
this.videoTime = DateTime.fromMillis(this.video.target.selector._valueMillis)
this.contextTime = this.videoTime
}
}
if (this.display) {
if (!this.cell.config.start) this.showPlayer = true
if (!this.cell.configuration.start) this.showPlayer = true
else {
// FIXME: replace timeout with more efficient solution
const _this = this
......
......@@ -27,7 +27,7 @@
},
mounted () {
const _this = this
this.$store.dispatch('maps/find', { type: constants.mapTypes.MAP_TYPE_TIMELINE })
this.$store.dispatch('maps/find', { type: constants.mapClasses.MAP_CLASS_TIMELINE })
.then(maps => {
if (maps.items) _this.timelines = maps.items
})
......
......@@ -19,19 +19,16 @@
q-item.q-px-md.q-py-lg.media-item
q-item-main
q-item-tile {{entry.title || entry.annotation._uuid}}
q-item-tile.q-mb-md {{entry.title || entry.annotation._uuid}}
//
q-item-tile.q-mb-md {{entry.title || entry.annotation._uuid}}
q-item-tile
//----- media
q-btn.bg-primary.text-white.media-button(@click="cacheNewCell(entry.annotation, 'CellMedia')", flat)
q-icon(name="local movies", size="22px")
q-item-tile
//----- media
q-btn.bg-primary.text-white.media-button(@click="cacheNewCell(entry.annotation, 'CellMedia')", flat)
q-icon(name="local movies", size="22px")
//----- annotations
q-btn.bg-primary.text-white.media-button.q-ml-sm(@click="cacheNewCell(entry.annotation, 'CellAnnotationList')", flat)
q-icon(name="comment", size="22px")
//----- annotations
q-btn.bg-primary.text-white.media-button.q-ml-sm(@click="cacheNewCell(entry.annotation, 'CellAnnotationList')", flat)
q-icon(name="comment", size="22px")
</template>
......
Markdown is supported
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