Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/apiManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export default class ApiManager {
static postSparkLaunch (args) {
return axios.post(opvSt + 'spark/launch', args)
}
static postCeleryLaunch (args) {
return axios.post(opvSt + 'celery/launch', args)
}
static getSparkPort () {
return axios.get(opvSt + 'spark/port')
}
Expand Down
5 changes: 4 additions & 1 deletion src/components/CampaignList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
<v-btn color="primary">Global campaign view</v-btn>
</router-link>
<router-link class="mr-1" :to="{ name: 'SparkValue', params: { id_campaign: props.item.id_campaign, id_malette: props.item.id_malette}}">
<v-btn color="primary">Stitch it</v-btn>
<v-btn color="primary">Spark</v-btn>
</router-link>
<router-link class="mr-1" :to="{ name: 'CeleryValue', params: { id_campaign: props.item.id_campaign, id_malette: props.item.id_malette}}">
<v-btn color="primary">Celery</v-btn>
</router-link>
<router-link class="mr-1" :to="{ name: 'PanoramaSelector', params: { id_campaign: props.item.id_campaign, id_malette: props.item.id_malette}}">
<v-btn color="primary">Panorama selection</v-btn>
Expand Down
86 changes: 86 additions & 0 deletions src/components/Celery.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<template>
<v-app>
<v-container fluid fill-height>
<v-layout align-center justify-center>
<v-flex xs7>
<v-card class="elevation-12">
<v-toolbar dark color="primary">
<v-toolbar-title>Celery</v-toolbar-title>
<v-spacer></v-spacer>
<Menu :where="'Celery'"></Menu>
</v-toolbar>
<v-card-text>
<v-container fluid grid-list-sm>
<v-layout row wrap>
<v-flex>
<v-card>
<v-card-text>
<v-text-field ref='campaignId' label='Campaign id' :value="id_campaign"></v-text-field>
<v-text-field ref='maletteId' label='Malette id' :value="id_malette"></v-text-field>
</v-card-text>
</v-card>
</v-flex>
<v-flex>
<v-card>
<v-card-text>
<v-btn @click="launchCelery()" color="primary">Launch celery</v-btn>
</v-card-text>
</v-card>
<v-card class="mt-1">
<v-card-text>
<v-list>
<v-list-tile>
<v-list-tile-content>Answer:</v-list-tile-content>
<v-list-tile-content class="align-end">{{answer}}</v-list-tile-content>
</v-list-tile>
<v-divider></v-divider>
<v-list-tile>
<v-btn :href="flowerUri" color="primary">Flower</v-btn>
</v-list-tile>
</v-list>
</v-card-text>
</v-card>
</v-flex>
</v-layout>
</v-container>
</v-card-text>
</v-card>
</v-flex>
</v-layout>
</v-container>
</v-app>
</template>
<script>
import Menu from '@/components/Menu'
import Config from '@/config'
import ApiManager from '@/apiManager'

export default {
name: 'Celery',
components: {
Menu
},
props: ['id_campaign', 'id_malette'],
data () {
return {
answer: 'You must ask something before'
}
},
methods: {
launchCelery () {
ApiManager.postCeleryLaunch({
'campaign_id': this.$refs.campaignId.$refs.input.value,
'malette_id': this.$refs.maletteId.$refs.input.value
})
.then(answer => {
this.answer = answer.data.answer
})
}
},
computed: {
flowerUri () {
return Config.server.host + ':' + Config.server.flower_port
}
}
}
</script>
6 changes: 3 additions & 3 deletions src/components/ImportCampaign.vue
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,21 @@ export default {
showLog () {
var args = '{}'
if (this.$refs.logFile.$refs.input.value !== '') {
args = JSON.stringify({'logFile': this.$refs.logFile.$refs.input.value})
args = {'logFile': this.$refs.logFile.$refs.input.value}
}
ApiManager.postImportLog(args).then(answer => {
this.log = answer.data.answer
})
},
launch () {
var args = JSON.stringify({
var args = {
'path': this.$refs.campaignDir.$refs.input.value,
'id_malette': this.$refs.idMalette.$refs.input.value,
'id_rederbro': this.$refs.idRederbro.$refs.input.value,
'camera_number': this.$refs.cameraNB.$refs.input.value,
'description': this.$refs.description.$refs.input.value,
'campaign_name': this.$refs.campaignName.$refs.input.value
})
}

ApiManager.postImportLaunch(args).then(answer => {
this.scan()
Expand Down
1 change: 1 addition & 0 deletions src/components/Menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default {
inputs: [
{name: 'Import data', link: 'ImportCampaign'},
{name: 'Spark', link: 'Spark'},
{name: 'Celery', link: 'Celery'},
{name: 'List', link: 'CampaignList'},
{name: 'Virtual tour viewer', link: 'VirtualTourViewer'}
]
Expand Down
1 change: 0 additions & 1 deletion src/components/Spark.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ export default {
if (this.$refs.customLaunchScript.$refs.input.value !== '') {
args.customLaunchScript = this.$refs.customLaunchScript.$refs.input.value
}
args = JSON.stringify(args)
ApiManager.postSparkLaunch(args).then(answer => {
this.answer = answer.data.answer
this.startScan()
Expand Down
6 changes: 3 additions & 3 deletions src/components/pathDetails/Parameter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ export default {
delete this.$parent.$parent.$parent.pathDetails.id_path_details
delete this.$parent.$parent.$parent.pathDetails.id_malette
this.$parent.$parent.$parent.pathDetails.name = this.$refs.newName.$refs.input.value
debugger
// debugger
apiManager.postPathDetails(this.$parent.$parent.$parent.pathDetails)
.then((pathDetails) => {
debugger
// debugger
this.$parent.$parent.$parent.pathDetails = pathDetails.data
this.$parent.$parent.$parent.save(false)
})
},
deleteAll () {
debugger
// debugger
this.$parent.$parent.$parent.deleteOldOne(this.$parent.$parent.$parent.pathNode)
.then(this.$parent.$parent.$parent.loadData)
},
Expand Down
144 changes: 0 additions & 144 deletions src/components/pathDetails/PathDetailsViewer.vue.orig

This file was deleted.

3 changes: 2 additions & 1 deletion src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"api_port": 5000,
"dm_port": 5050,
"status_port": 5001,
"graph_port": 5015
"graph_port": 5015,
"flower_port": 5555
},
"picture": 6
}
13 changes: 13 additions & 0 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Campaign from '@/components/campaign/Campaign'
import PanoViewer from '@/components/PanoViewer'
import ImportCampaign from '@/components/ImportCampaign'
import Spark from '@/components/Spark'
import Celery from '@/components/Celery'
import PanoramaSelector from '@/components/panoramaSelector/PanoramaSelector'
import PathDetailsViewer from '@/components/pathDetails/PathDetailsViewer'
import PathDetailsEditor from '@/components/pathDetails/PathDetailsEditor'
Expand Down Expand Up @@ -50,6 +51,18 @@ export default new Router({
name: 'Spark',
component: Spark
},
{
path: '/celery/:id_campaign/:id_malette',
props: true,
name: 'CeleryValue',
component: Celery
},
{
path: '/celery/',
props: false,
name: 'Celery',
component: Celery
},
{
path: '/panoramaSelector/:id_campaign/:id_malette',
props: true,
Expand Down