From a35e3fca089e6c47c76bc86be660e23e8e9bb7c5 Mon Sep 17 00:00:00 2001
From: Dorian Goepp <dorian.goepp@gmail.com>
Date: Thu, 4 Apr 2019 14:50:01 +0200
Subject: [PATCH] merge development configurations
---
src/Board.js | 6 +-
src/devel-1-config.js | 107 ---------------------
src/devel-3-config.js | 104 --------------------
src/{devel-2-config.js => devel-config.js} | 29 ++++--
4 files changed, 24 insertions(+), 222 deletions(-)
delete mode 100644 src/devel-1-config.js
delete mode 100644 src/devel-3-config.js
rename src/{devel-2-config.js => devel-config.js} (81%)
diff --git a/src/Board.js b/src/Board.js
index c276a86..7120bb4 100755
--- a/src/Board.js
+++ b/src/Board.js
@@ -14,10 +14,8 @@ import { RosMood, DemoMood } from './Mood'
import DemoString from './String'
// get the default configuration for the layout
-import {flexlayout_json as json} from './demo-1-config'
-// import {flexlayout_json as json} from './devel-1-config'
-// import {flexlayout_json as json} from './devel-2-config'
-// import {flexlayout_json as json} from './devel-3-config'
+// import {flexlayout_json as json} from './demo-1-config'
+import {flexlayout_json as json} from './devel-config'
// CSS
import './Common.css'
diff --git a/src/devel-1-config.js b/src/devel-1-config.js
deleted file mode 100644
index 6c0a666..0000000
--- a/src/devel-1-config.js
+++ /dev/null
@@ -1,107 +0,0 @@
-export const flexlayout_json = {
- global: {
- splitterSize: 5,
- tabSetTabStripHeight: 30,
- },
- // "borders": [
- // {
- // "type":"border",
- // "location": "left",
- // "children": [
- // {
- // "type": "tab",
- // "enableClose":false,
- // "name": "Latest sa interaction",
- // "component": "latest-interaction",
- // },
- // ]
- // },
- // ],
- layout: {
- "type": "row",
- "weight": 100,
- "children": [
- {
- "type": "tabset",
- "weight": 50,
- "selected": 0,
- "children": [
- {
- "type": "tab",
- "name": "Interaction trace",
- "component": "int-trace"
- },
- {
- "type": "tab",
- "name": "Normal plot",
- "component": "line-chart"
- },
- {
- "type": "tab",
- "name": "Demo plot",
- "component": "demo-line-chart"
- },
- {
- "type": "tab",
- "name": "Video Stream title",
- "component": "demo-video",
- "config": {"configurable": true}
- }
- ]
- },
- {
- "type": "row",
- "weight": 50,
- "children": [
- {
- "type": "tabset",
- "weight": 25,
- "selected": 0,
- "children": [
- {
- "type": "tab",
- "name": "Current mood",
- "component": "demo-mood"
- },
- {
- "type": "tab",
- "name": "Root's second memory",
- "component": "memory-scale"
- },
- {
- "type": "tab",
- "name": "Horizontal Gauge title",
- "component": "h-gauge"
- }
- ]
- },
- {
- "type": "tabset",
- "weight": 25,
- "selected": 0,
- "children": [
- {
- "type": "tab",
- "name": "Satest interaction",
- "component": "latest-interaction"
- },
- {
- "type": "tab",
- "name": "Print a string",
- "component": "string"
- },
- {
- "type": "tab",
- "name": "Second h-gauge",
- "component": "h-gauge",
- "config": {
- "configurable": false
- }
- },
- ]
- }
- ]
- }
- ]
- }
-};
\ No newline at end of file
diff --git a/src/devel-3-config.js b/src/devel-3-config.js
deleted file mode 100644
index 87eaa69..0000000
--- a/src/devel-3-config.js
+++ /dev/null
@@ -1,104 +0,0 @@
-export const flexlayout_json = {
- global: {
- splitterSize: 5,
- tabSetTabStripHeight: 30,
- tabSetHeaderHeight: 25,
- enableEdgeDock: false,
- tabEnableRename: false,
- tabSetEnableHeader: false,
- tabSetEnableTabStrip: false,
- },
- layout: {
- "type": "row",
- "weight": 100,
- "children": [
- {
- "type": "tabset",
- "name": "Interaction trace",
- "active": true,
- "weight": 50,
- "selected": 0,
- "children": [
- {
- "type": "tab",
- "component": "int-trace"
- },
- ]
- },
- {
- "type": "row",
- "weight": 50,
- "children": [
- {
- "type": "tabset",
- "name": "Robot's memory",
- "weight": 65,
- "selected": 0,
- "children": [
- {
- "type": "tab",
- "component": "memory"
- },
- ]
- },
- {
- "type": "row",
- "weight": 35,
- "children": [
- {
- "type": "tabset",
- "name": "Latest interaction",
- "weight": 25,
- "selected": 0,
- "children": [
- {
- "type": "tab",
- "component": "latest-interaction"
- },
- ]
- },
- {
- "type": "row",
- "weight": 25,
- "children": [
- {
- "type": "tabset",
- "name": "Current mood",
- "children": [
- {
- "type": "tab",
- "component": "mood"
- },
- ]
- },
- {
- "type": "tabset",
- "name": "Involvement",
- "children": [
- {
- "type": "tab",
- "component": "h-gauge"
- },
- ]
- },
- ]
- },
- {
- "type": "tabset",
- "name": "Robot video stream",
- "weight": 50,
- "children": [
- {
- "type": "tab",
- "component": "demo-video",
- "config": {"configurable": false}
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- }
-};
diff --git a/src/devel-2-config.js b/src/devel-config.js
similarity index 81%
rename from src/devel-2-config.js
rename to src/devel-config.js
index 0c52a04..39dbf2f 100644
--- a/src/devel-2-config.js
+++ b/src/devel-config.js
@@ -2,26 +2,41 @@ export const flexlayout_json = {
global: {
splitterSize: 5,
tabSetTabStripHeight: 30,
+ tabSetHeaderHeight: 25,
enableEdgeDock: false,
tabEnableRename: false,
tabSetEnableHeader: false,
tabSetEnableTabStrip: false,
},
+ // "borders": [
+ // {
+ // "type":"border",
+ // "location": "left",
+ // "children": [
+ // {
+ // "type": "tab",
+ // "enableClose":false,
+ // "name": "Latest sa interaction",
+ // "component": "latest-interaction",
+ // },
+ // ]
+ // },
+ // ],
layout: {
"type": "row",
"weight": 100,
"children": [
{
"type": "tabset",
+ "name": "Interaction trace",
"weight": 50,
"selected": 0,
"children": [
{
"type": "tab",
- "name": "Interaction trace",
"component": "int-trace",
"config": {
- "hasReadme": false,
+ "hasReadme": true,
"configurable" : false
}
},
@@ -33,12 +48,12 @@ export const flexlayout_json = {
"children": [
{
"type": "tabset",
+ "name": "Robot's memory",
"weight": 65,
"selected": 0,
"children": [
{
"type": "tab",
- "name": "Robot's memory",
"component": "memory",
"config": {
"configurable": false,
@@ -53,12 +68,12 @@ export const flexlayout_json = {
"children": [
{
"type": "tabset",
+ "name": "Latest interaction",
"weight": 25,
"selected": 0,
"children": [
{
"type": "tab",
- "name": "Latest interaction",
"component": "latest-interaction",
"config": {
"configurable": false,
@@ -73,10 +88,10 @@ export const flexlayout_json = {
"children": [
{
"type": "tabset",
+ "name": "Current mood",
"children": [
{
"type": "tab",
- "name": "Current mood",
"component": "mood",
"config": {
"configurable": false,
@@ -87,10 +102,10 @@ export const flexlayout_json = {
},
{
"type": "tabset",
+ "name": "Involvement",
"children": [
{
"type": "tab",
- "name": "Involvement",
"component": "h-gauge",
"config": {
"configurable": false,
@@ -103,11 +118,11 @@ export const flexlayout_json = {
},
{
"type": "tabset",
+ "name": "Robot video stream",
"weight": 50,
"children": [
{
"type": "tab",
- "name": "Robot video stream",
"component": "demo-video",
"config": {
"configurable": false,
--
GitLab