Add new Ellipse drawing object in Display Layouts (#4153)

* Add new ellipse drawing object to Display Layouts
- Fix test and linting issues;

Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
This commit is contained in:
Charles Hacskaylo 2021-08-30 10:29:05 -07:00 committed by GitHub
parent 40055ba955
commit 9461ad8edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 308 additions and 120 deletions

View File

@ -141,6 +141,7 @@ const NON_STYLEABLE_CONTAINER_TYPES = [
const NON_STYLEABLE_LAYOUT_ITEM_TYPES = [ const NON_STYLEABLE_LAYOUT_ITEM_TYPES = [
'line-view', 'line-view',
'box-view', 'box-view',
'ellipse-view',
'image-view' 'image-view'
]; ];

View File

@ -230,7 +230,7 @@ describe('the plugin', function () {
}; };
const staticStyle = { const staticStyle = {
"style": { "style": {
"backgroundColor": "#717171", "backgroundColor": "#666666",
"border": "1px solid #00ffff" "border": "1px solid #00ffff"
} }
}; };
@ -238,7 +238,7 @@ describe('the plugin', function () {
"conditionId": "39584410-cbf9-499e-96dc-76f27e69885d", "conditionId": "39584410-cbf9-499e-96dc-76f27e69885d",
"style": { "style": {
"isStyleInvisible": "", "isStyleInvisible": "",
"backgroundColor": "#717171", "backgroundColor": "#666666",
"border": "1px solid #ffff00" "border": "1px solid #ffff00"
} }
}; };
@ -250,7 +250,7 @@ describe('the plugin', function () {
"configuration": { "configuration": {
"items": [ "items": [
{ {
"fill": "#717171", "fill": "#666666",
"stroke": "", "stroke": "",
"x": 1, "x": 1,
"y": 1, "y": 1,
@ -259,12 +259,22 @@ describe('the plugin', function () {
"type": "box-view", "type": "box-view",
"id": "89b88746-d325-487b-aec4-11b79afff9e8" "id": "89b88746-d325-487b-aec4-11b79afff9e8"
}, },
{
"fill": "#666666",
"stroke": "",
"x": 1,
"y": 1,
"width": 10,
"height": 5,
"type": "ellipse-view",
"id": "19b88746-d325-487b-aec4-11b79afff9z8"
},
{ {
"x": 18, "x": 18,
"y": 9, "y": 9,
"x2": 23, "x2": 23,
"y2": 4, "y2": 4,
"stroke": "#717171", "stroke": "#666666",
"type": "line-view", "type": "line-view",
"id": "57d49a28-7863-43bd-9593-6570758916f0" "id": "57d49a28-7863-43bd-9593-6570758916f0"
}, },
@ -299,12 +309,12 @@ describe('the plugin', function () {
"y": 9, "y": 9,
"x2": 23, "x2": 23,
"y2": 4, "y2": 4,
"stroke": "#717171", "stroke": "#666666",
"type": "line-view", "type": "line-view",
"id": "57d49a28-7863-43bd-9593-6570758916f0" "id": "57d49a28-7863-43bd-9593-6570758916f0"
}; };
boxLayoutItem = { boxLayoutItem = {
"fill": "#717171", "fill": "#666666",
"stroke": "", "stroke": "",
"x": 1, "x": 1,
"y": 1, "y": 1,

View File

@ -29,9 +29,10 @@ const styleProps = {
noneValue: NONE_VALUE, noneValue: NONE_VALUE,
applicableForType: type => { applicableForType: type => {
return !type ? true : (type === 'text-view' return !type ? true : (type === 'text-view'
|| type === 'telemetry-view' || type === 'telemetry-view'
|| type === 'box-view' || type === 'box-view'
|| type === 'subobject-view'); || type === 'ellipse-view'
|| type === 'subobject-view');
} }
}, },
border: { border: {
@ -41,6 +42,7 @@ const styleProps = {
return !type ? true : (type === 'text-view' return !type ? true : (type === 'text-view'
|| type === 'telemetry-view' || type === 'telemetry-view'
|| type === 'box-view' || type === 'box-view'
|| type === 'ellipse-view'
|| type === 'image-view' || type === 'image-view'
|| type === 'line-view' || type === 'line-view'
|| type === 'subobject-view'); || type === 'subobject-view');

View File

@ -149,6 +149,7 @@ define(['lodash'], function (_) {
return type === 'text-view' return type === 'text-view'
|| type === 'telemetry-view' || type === 'telemetry-view'
|| type === 'box-view' || type === 'box-view'
|| type === 'ellipse-view'
|| type === 'image-view' || type === 'image-view'
|| type === 'line-view' || type === 'line-view'
|| type === 'subobject-view'; || type === 'subobject-view';
@ -180,6 +181,10 @@ define(['lodash'], function (_) {
"name": "Box", "name": "Box",
"class": "icon-box-round-corners" "class": "icon-box-round-corners"
}, },
{
"name": "Ellipse",
"class": "icon-circle"
},
{ {
"name": "Line", "name": "Line",
"class": "icon-line-horz" "class": "icon-line-horz"
@ -745,7 +750,7 @@ define(['lodash'], function (_) {
if (toolbar.remove.length === 0) { if (toolbar.remove.length === 0) {
toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)]; toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
} }
} else if (layoutItem.type === 'box-view') { } else if (layoutItem.type === 'box-view' || layoutItem.type === 'ellipse-view') {
if (toolbar.position.length === 0) { if (toolbar.position.length === 0) {
toolbar.position = [ toolbar.position = [
getStackOrder(selectedParent, selectionPath), getStackOrder(selectedParent, selectionPath),

View File

@ -43,7 +43,7 @@ import conditionalStylesMixin from '../mixins/objectStyles-mixin';
export default { export default {
makeDefinition() { makeDefinition() {
return { return {
fill: '#717171', fill: '#666666',
stroke: '', stroke: '',
x: 1, x: 1,
y: 1, y: 1,

View File

@ -76,6 +76,7 @@ import uuid from 'uuid';
import SubobjectView from './SubobjectView.vue'; import SubobjectView from './SubobjectView.vue';
import TelemetryView from './TelemetryView.vue'; import TelemetryView from './TelemetryView.vue';
import BoxView from './BoxView.vue'; import BoxView from './BoxView.vue';
import EllipseView from './EllipseView.vue';
import TextView from './TextView.vue'; import TextView from './TextView.vue';
import LineView from './LineView.vue'; import LineView from './LineView.vue';
import ImageView from './ImageView.vue'; import ImageView from './ImageView.vue';
@ -112,6 +113,7 @@ const ITEM_TYPE_VIEW_MAP = {
'subobject-view': SubobjectView, 'subobject-view': SubobjectView,
'telemetry-view': TelemetryView, 'telemetry-view': TelemetryView,
'box-view': BoxView, 'box-view': BoxView,
'ellipse-view': EllipseView,
'line-view': LineView, 'line-view': LineView,
'text-view': TextView, 'text-view': TextView,
'image-view': ImageView 'image-view': ImageView

View File

@ -0,0 +1,122 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2021, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
<template>
<layout-frame
:item="item"
:grid-size="gridSize"
:is-editing="isEditing"
@move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"
>
<div
class="c-ellipse-view u-style-receiver js-style-receiver"
:class="[styleClass]"
:style="style"
></div>
</layout-frame>
</template>
<script>
import LayoutFrame from './LayoutFrame.vue';
import conditionalStylesMixin from '../mixins/objectStyles-mixin';
export default {
makeDefinition() {
return {
fill: '#666666',
stroke: '',
x: 1,
y: 1,
width: 10,
height: 10
};
},
components: {
LayoutFrame
},
mixins: [conditionalStylesMixin],
inject: ['openmct'],
props: {
item: {
type: Object,
required: true
},
gridSize: {
type: Array,
required: true,
validator: (arr) => arr && arr.length === 2
&& arr.every(el => typeof el === 'number')
},
index: {
type: Number,
required: true
},
initSelect: Boolean,
isEditing: {
type: Boolean,
required: true
}
},
computed: {
style() {
if (this.itemStyle) {
return this.itemStyle;
} else {
return {
backgroundColor: this.item.fill,
border: this.item.stroke ? '1px solid ' + this.item.stroke : ''
};
}
}
},
watch: {
index(newIndex) {
if (!this.context) {
return;
}
this.context.index = newIndex;
},
item(newItem) {
if (!this.context) {
return;
}
this.context.layoutItem = newItem;
}
},
mounted() {
this.context = {
layoutItem: this.item,
index: this.index
};
this.removeSelectable = this.openmct.selection.selectable(
this.$el, this.context, this.initSelect);
},
destroyed() {
if (this.removeSelectable) {
this.removeSelectable();
}
}
};
</script>

View File

@ -96,7 +96,7 @@ export default {
y: 10, y: 10,
x2: 10, x2: 10,
y2: 5, y2: 5,
stroke: '#717171' stroke: '#666666'
}; };
}, },
mixins: [conditionalStylesMixin], mixins: [conditionalStylesMixin],

View File

@ -1,4 +1,5 @@
.c-box-view { .c-box-view,
.c-ellipse-view {
border-width: $drawingObjBorderW !important; border-width: $drawingObjBorderW !important;
display: flex; display: flex;
align-items: stretch; align-items: stretch;
@ -8,6 +9,10 @@
} }
} }
.c-ellipse-view {
border-radius: 50%;
}
.c-line-view { .c-line-view {
&.c-frame { &.c-frame {
box-shadow: none !important; box-shadow: none !important;

View File

@ -186,7 +186,7 @@ describe('the plugin', function () {
'configuration': { 'configuration': {
'items': [ 'items': [
{ {
'fill': '#717171', 'fill': '#666666',
'stroke': '', 'stroke': '',
'x': 1, 'x': 1,
'y': 1, 'y': 1,
@ -195,12 +195,22 @@ describe('the plugin', function () {
'type': 'box-view', 'type': 'box-view',
'id': '89b88746-d325-487b-aec4-11b79afff9e8' 'id': '89b88746-d325-487b-aec4-11b79afff9e8'
}, },
{
'fill': '#666666',
'stroke': '',
'x': 1,
'y': 1,
'width': 10,
'height': 10,
'type': 'ellipse-view',
'id': '19b88746-d325-487b-aec4-11b79afff9z8'
},
{ {
'x': 18, 'x': 18,
'y': 9, 'y': 9,
'x2': 23, 'x2': 23,
'y2': 4, 'y2': 4,
'stroke': '#717171', 'stroke': '#666666',
'type': 'line-view', 'type': 'line-view',
'id': '57d49a28-7863-43bd-9593-6570758916f0' 'id': '57d49a28-7863-43bd-9593-6570758916f0'
}, },
@ -341,7 +351,7 @@ describe('the plugin', function () {
it('provides controls including separators', () => { it('provides controls including separators', () => {
const displayLayoutToolbar = openmct.toolbars.get(selection); const displayLayoutToolbar = openmct.toolbars.get(selection);
expect(displayLayoutToolbar.length).toBe(9); expect(displayLayoutToolbar.length).toBe(7);
}); });
}); });
}); });

View File

@ -154,6 +154,7 @@ $glyph-icon-flag: '\e92a';
$glyph-icon-eye-disabled: '\e92b'; $glyph-icon-eye-disabled: '\e92b';
$glyph-icon-notebook-page: '\e92c'; $glyph-icon-notebook-page: '\e92c';
$glyph-icon-unlocked: '\e92d'; $glyph-icon-unlocked: '\e92d';
$glyph-icon-circle: '\e92e';
$glyph-icon-arrows-right-left: '\ea00'; $glyph-icon-arrows-right-left: '\ea00';
$glyph-icon-arrows-up-down: '\ea01'; $glyph-icon-arrows-up-down: '\ea01';
$glyph-icon-bullet: '\ea02'; $glyph-icon-bullet: '\ea02';

View File

@ -85,6 +85,7 @@
.icon-eye-disabled { @include glyphBefore($glyph-icon-eye-disabled); } .icon-eye-disabled { @include glyphBefore($glyph-icon-eye-disabled); }
.icon-notebook-page { @include glyphBefore($glyph-icon-notebook-page); } .icon-notebook-page { @include glyphBefore($glyph-icon-notebook-page); }
.icon-unlocked { @include glyphBefore($glyph-icon-unlocked); } .icon-unlocked { @include glyphBefore($glyph-icon-unlocked); }
.icon-circle { @include glyphBefore($glyph-icon-circle); }
.icon-arrows-right-left { @include glyphBefore($glyph-icon-arrows-right-left); } .icon-arrows-right-left { @include glyphBefore($glyph-icon-arrows-right-left); }
.icon-arrows-up-down { @include glyphBefore($glyph-icon-arrows-up-down); } .icon-arrows-up-down { @include glyphBefore($glyph-icon-arrows-up-down); }
.icon-bullet { @include glyphBefore($glyph-icon-bullet); } .icon-bullet { @include glyphBefore($glyph-icon-bullet); }

View File

@ -2,7 +2,7 @@
"metadata": { "metadata": {
"name": "Open MCT Symbols 16px", "name": "Open MCT Symbols 16px",
"lastOpened": 0, "lastOpened": 0,
"created": 1621648023886 "created": 1629996145999
}, },
"iconSets": [ "iconSets": [
{ {
@ -375,13 +375,21 @@
"code": 59693, "code": 59693,
"tempChar": "" "tempChar": ""
}, },
{
"order": 197,
"id": 169,
"name": "icon-circle",
"prevSize": 24,
"code": 59694,
"tempChar": ""
},
{ {
"order": 27, "order": 27,
"id": 105, "id": 105,
"name": "icon-arrows-right-left", "name": "icon-arrows-right-left",
"prevSize": 24, "prevSize": 24,
"code": 59904, "code": 59904,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 26, "order": 26,
@ -389,7 +397,7 @@
"name": "icon-arrows-up-down", "name": "icon-arrows-up-down",
"prevSize": 24, "prevSize": 24,
"code": 59905, "code": 59905,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 68, "order": 68,
@ -397,7 +405,7 @@
"name": "icon-bullet", "name": "icon-bullet",
"prevSize": 24, "prevSize": 24,
"code": 59906, "code": 59906,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 150, "order": 150,
@ -405,7 +413,7 @@
"prevSize": 24, "prevSize": 24,
"code": 59907, "code": 59907,
"name": "icon-calendar", "name": "icon-calendar",
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 45, "order": 45,
@ -413,7 +421,7 @@
"name": "icon-chain-links", "name": "icon-chain-links",
"prevSize": 24, "prevSize": 24,
"code": 59908, "code": 59908,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 73, "order": 73,
@ -421,7 +429,7 @@
"name": "icon-download", "name": "icon-download",
"prevSize": 24, "prevSize": 24,
"code": 59909, "code": 59909,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 39, "order": 39,
@ -429,7 +437,7 @@
"name": "icon-duplicate", "name": "icon-duplicate",
"prevSize": 24, "prevSize": 24,
"code": 59910, "code": 59910,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 50, "order": 50,
@ -437,7 +445,7 @@
"name": "icon-folder-new", "name": "icon-folder-new",
"prevSize": 24, "prevSize": 24,
"code": 59911, "code": 59911,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 138, "order": 138,
@ -445,7 +453,7 @@
"name": "icon-fullscreen-collapse", "name": "icon-fullscreen-collapse",
"prevSize": 24, "prevSize": 24,
"code": 59912, "code": 59912,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 139, "order": 139,
@ -453,7 +461,7 @@
"name": "icon-fullscreen-expand", "name": "icon-fullscreen-expand",
"prevSize": 24, "prevSize": 24,
"code": 59913, "code": 59913,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 122, "order": 122,
@ -461,7 +469,7 @@
"name": "icon-layers", "name": "icon-layers",
"prevSize": 24, "prevSize": 24,
"code": 59914, "code": 59914,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 151, "order": 151,
@ -469,7 +477,7 @@
"name": "icon-line-horz", "name": "icon-line-horz",
"prevSize": 24, "prevSize": 24,
"code": 59915, "code": 59915,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 100, "order": 100,
@ -477,7 +485,7 @@
"name": "icon-magnify", "name": "icon-magnify",
"prevSize": 24, "prevSize": 24,
"code": 59916, "code": 59916,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 99, "order": 99,
@ -485,7 +493,7 @@
"name": "icon-magnify-in", "name": "icon-magnify-in",
"prevSize": 24, "prevSize": 24,
"code": 59917, "code": 59917,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 101, "order": 101,
@ -493,7 +501,7 @@
"name": "icon-magnify-out-v2", "name": "icon-magnify-out-v2",
"prevSize": 24, "prevSize": 24,
"code": 59918, "code": 59918,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 103, "order": 103,
@ -501,7 +509,7 @@
"name": "icon-menu", "name": "icon-menu",
"prevSize": 24, "prevSize": 24,
"code": 59919, "code": 59919,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 124, "order": 124,
@ -509,7 +517,7 @@
"name": "icon-move", "name": "icon-move",
"prevSize": 24, "prevSize": 24,
"code": 59920, "code": 59920,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 7, "order": 7,
@ -517,7 +525,7 @@
"name": "icon-new-window", "name": "icon-new-window",
"prevSize": 24, "prevSize": 24,
"code": 59921, "code": 59921,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 63, "order": 63,
@ -525,7 +533,7 @@
"name": "icon-paint-bucket-v2", "name": "icon-paint-bucket-v2",
"prevSize": 24, "prevSize": 24,
"code": 59922, "code": 59922,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 15, "order": 15,
@ -533,7 +541,7 @@
"name": "icon-pencil", "name": "icon-pencil",
"prevSize": 24, "prevSize": 24,
"code": 59923, "code": 59923,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 54, "order": 54,
@ -541,7 +549,7 @@
"name": "icon-pencil-edit-in-place", "name": "icon-pencil-edit-in-place",
"prevSize": 24, "prevSize": 24,
"code": 59924, "code": 59924,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 40, "order": 40,
@ -549,7 +557,7 @@
"name": "icon-play", "name": "icon-play",
"prevSize": 24, "prevSize": 24,
"code": 59925, "code": 59925,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 125, "order": 125,
@ -557,7 +565,7 @@
"name": "icon-pause", "name": "icon-pause",
"prevSize": 24, "prevSize": 24,
"code": 59926, "code": 59926,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 119, "order": 119,
@ -565,7 +573,7 @@
"name": "icon-plot-resource", "name": "icon-plot-resource",
"prevSize": 24, "prevSize": 24,
"code": 59927, "code": 59927,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 48, "order": 48,
@ -573,7 +581,7 @@
"name": "icon-pointer-left", "name": "icon-pointer-left",
"prevSize": 24, "prevSize": 24,
"code": 59928, "code": 59928,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 47, "order": 47,
@ -581,7 +589,7 @@
"name": "icon-pointer-right", "name": "icon-pointer-right",
"prevSize": 24, "prevSize": 24,
"code": 59929, "code": 59929,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 85, "order": 85,
@ -589,7 +597,7 @@
"name": "icon-refresh", "name": "icon-refresh",
"prevSize": 24, "prevSize": 24,
"code": 59930, "code": 59930,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 55, "order": 55,
@ -597,7 +605,7 @@
"name": "icon-save", "name": "icon-save",
"prevSize": 24, "prevSize": 24,
"code": 59931, "code": 59931,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 56, "order": 56,
@ -605,7 +613,7 @@
"name": "icon-save-as", "name": "icon-save-as",
"prevSize": 24, "prevSize": 24,
"code": 59932, "code": 59932,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 58, "order": 58,
@ -613,7 +621,7 @@
"name": "icon-sine", "name": "icon-sine",
"prevSize": 24, "prevSize": 24,
"code": 59933, "code": 59933,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 113, "order": 113,
@ -621,7 +629,7 @@
"name": "icon-font", "name": "icon-font",
"prevSize": 24, "prevSize": 24,
"code": 59934, "code": 59934,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 41, "order": 41,
@ -629,7 +637,7 @@
"name": "icon-thumbs-strip", "name": "icon-thumbs-strip",
"prevSize": 24, "prevSize": 24,
"code": 59935, "code": 59935,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 146, "order": 146,
@ -637,7 +645,7 @@
"name": "icon-two-parts-both", "name": "icon-two-parts-both",
"prevSize": 24, "prevSize": 24,
"code": 59936, "code": 59936,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 145, "order": 145,
@ -645,7 +653,7 @@
"name": "icon-two-parts-one-only", "name": "icon-two-parts-one-only",
"prevSize": 24, "prevSize": 24,
"code": 59937, "code": 59937,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 82, "order": 82,
@ -653,7 +661,7 @@
"name": "icon-resync", "name": "icon-resync",
"prevSize": 24, "prevSize": 24,
"code": 59938, "code": 59938,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 86, "order": 86,
@ -661,7 +669,7 @@
"name": "icon-reset", "name": "icon-reset",
"prevSize": 24, "prevSize": 24,
"code": 59939, "code": 59939,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 61, "order": 61,
@ -669,7 +677,7 @@
"name": "icon-x-in-circle", "name": "icon-x-in-circle",
"prevSize": 24, "prevSize": 24,
"code": 59940, "code": 59940,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 84, "order": 84,
@ -677,7 +685,7 @@
"name": "icon-brightness", "name": "icon-brightness",
"prevSize": 24, "prevSize": 24,
"code": 59941, "code": 59941,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 83, "order": 83,
@ -685,7 +693,7 @@
"name": "icon-contrast", "name": "icon-contrast",
"prevSize": 24, "prevSize": 24,
"code": 59942, "code": 59942,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 87, "order": 87,
@ -693,7 +701,7 @@
"name": "icon-expand", "name": "icon-expand",
"prevSize": 24, "prevSize": 24,
"code": 59943, "code": 59943,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 89, "order": 89,
@ -701,7 +709,7 @@
"name": "icon-list-view", "name": "icon-list-view",
"prevSize": 24, "prevSize": 24,
"code": 59944, "code": 59944,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 133, "order": 133,
@ -709,7 +717,7 @@
"name": "icon-grid-snap-to", "name": "icon-grid-snap-to",
"prevSize": 24, "prevSize": 24,
"code": 59945, "code": 59945,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 132, "order": 132,
@ -717,7 +725,7 @@
"name": "icon-grid-snap-no", "name": "icon-grid-snap-no",
"prevSize": 24, "prevSize": 24,
"code": 59946, "code": 59946,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 94, "order": 94,
@ -725,7 +733,7 @@
"name": "icon-frame-show", "name": "icon-frame-show",
"prevSize": 24, "prevSize": 24,
"code": 59947, "code": 59947,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 95, "order": 95,
@ -733,7 +741,7 @@
"name": "icon-frame-hide", "name": "icon-frame-hide",
"prevSize": 24, "prevSize": 24,
"code": 59948, "code": 59948,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 97, "order": 97,
@ -741,7 +749,7 @@
"name": "icon-import", "name": "icon-import",
"prevSize": 24, "prevSize": 24,
"code": 59949, "code": 59949,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 96, "order": 96,
@ -749,7 +757,7 @@
"name": "icon-export", "name": "icon-export",
"prevSize": 24, "prevSize": 24,
"code": 59950, "code": 59950,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 194, "order": 194,
@ -757,7 +765,7 @@
"name": "icon-font-size", "name": "icon-font-size",
"prevSize": 24, "prevSize": 24,
"code": 59951, "code": 59951,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 163, "order": 163,
@ -765,7 +773,7 @@
"name": "icon-clear-data", "name": "icon-clear-data",
"prevSize": 24, "prevSize": 24,
"code": 59952, "code": 59952,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 173, "order": 173,
@ -773,7 +781,7 @@
"name": "icon-history", "name": "icon-history",
"prevSize": 24, "prevSize": 24,
"code": 59953, "code": 59953,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 181, "order": 181,
@ -781,7 +789,7 @@
"name": "icon-arrow-up-to-parent", "name": "icon-arrow-up-to-parent",
"prevSize": 24, "prevSize": 24,
"code": 59954, "code": 59954,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 184, "order": 184,
@ -789,7 +797,7 @@
"name": "icon-crosshair-in-circle", "name": "icon-crosshair-in-circle",
"prevSize": 24, "prevSize": 24,
"code": 59955, "code": 59955,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 185, "order": 185,
@ -797,7 +805,7 @@
"name": "icon-target", "name": "icon-target",
"prevSize": 24, "prevSize": 24,
"code": 59956, "code": 59956,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 187, "order": 187,
@ -805,7 +813,7 @@
"name": "icon-items-collapse", "name": "icon-items-collapse",
"prevSize": 24, "prevSize": 24,
"code": 59957, "code": 59957,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 188, "order": 188,
@ -813,7 +821,7 @@
"name": "icon-items-expand", "name": "icon-items-expand",
"prevSize": 24, "prevSize": 24,
"code": 59958, "code": 59958,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 190, "order": 190,
@ -821,7 +829,7 @@
"name": "icon-3-dots", "name": "icon-3-dots",
"prevSize": 24, "prevSize": 24,
"code": 59959, "code": 59959,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 193, "order": 193,
@ -829,7 +837,7 @@
"name": "icon-grid-on", "name": "icon-grid-on",
"prevSize": 24, "prevSize": 24,
"code": 59960, "code": 59960,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 192, "order": 192,
@ -837,7 +845,7 @@
"name": "icon-grid-off", "name": "icon-grid-off",
"prevSize": 24, "prevSize": 24,
"code": 59961, "code": 59961,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 191, "order": 191,
@ -845,7 +853,7 @@
"name": "icon-camera", "name": "icon-camera",
"prevSize": 24, "prevSize": 24,
"code": 59962, "code": 59962,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 196, "order": 196,
@ -853,7 +861,7 @@
"name": "icon-folders-collapse", "name": "icon-folders-collapse",
"prevSize": 24, "prevSize": 24,
"code": 59963, "code": 59963,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 144, "order": 144,
@ -861,7 +869,7 @@
"name": "icon-activity", "name": "icon-activity",
"prevSize": 24, "prevSize": 24,
"code": 60160, "code": 60160,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 104, "order": 104,
@ -869,7 +877,7 @@
"name": "icon-activity-mode", "name": "icon-activity-mode",
"prevSize": 24, "prevSize": 24,
"code": 60161, "code": 60161,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 137, "order": 137,
@ -877,7 +885,7 @@
"name": "icon-autoflow-tabular", "name": "icon-autoflow-tabular",
"prevSize": 24, "prevSize": 24,
"code": 60162, "code": 60162,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 115, "order": 115,
@ -885,7 +893,7 @@
"name": "icon-clock", "name": "icon-clock",
"prevSize": 24, "prevSize": 24,
"code": 60163, "code": 60163,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 2, "order": 2,
@ -893,7 +901,7 @@
"name": "icon-database", "name": "icon-database",
"prevSize": 24, "prevSize": 24,
"code": 60164, "code": 60164,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 3, "order": 3,
@ -901,7 +909,7 @@
"name": "icon-database-query", "name": "icon-database-query",
"prevSize": 24, "prevSize": 24,
"code": 60165, "code": 60165,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 67, "order": 67,
@ -909,7 +917,7 @@
"name": "icon-dataset", "name": "icon-dataset",
"prevSize": 24, "prevSize": 24,
"code": 60166, "code": 60166,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 59, "order": 59,
@ -917,7 +925,7 @@
"name": "icon-datatable", "name": "icon-datatable",
"prevSize": 24, "prevSize": 24,
"code": 60167, "code": 60167,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 136, "order": 136,
@ -925,7 +933,7 @@
"name": "icon-dictionary", "name": "icon-dictionary",
"prevSize": 24, "prevSize": 24,
"code": 60168, "code": 60168,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 51, "order": 51,
@ -933,7 +941,7 @@
"name": "icon-folder", "name": "icon-folder",
"prevSize": 24, "prevSize": 24,
"code": 60169, "code": 60169,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 147, "order": 147,
@ -941,7 +949,7 @@
"name": "icon-image", "name": "icon-image",
"prevSize": 24, "prevSize": 24,
"code": 60170, "code": 60170,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 4, "order": 4,
@ -949,7 +957,7 @@
"name": "icon-layout", "name": "icon-layout",
"prevSize": 24, "prevSize": 24,
"code": 60171, "code": 60171,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 24, "order": 24,
@ -957,7 +965,7 @@
"name": "icon-object", "name": "icon-object",
"prevSize": 24, "prevSize": 24,
"code": 60172, "code": 60172,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 52, "order": 52,
@ -965,7 +973,7 @@
"name": "icon-object-unknown", "name": "icon-object-unknown",
"prevSize": 24, "prevSize": 24,
"code": 60173, "code": 60173,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 105, "order": 105,
@ -973,7 +981,7 @@
"name": "icon-packet", "name": "icon-packet",
"prevSize": 24, "prevSize": 24,
"code": 60174, "code": 60174,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 126, "order": 126,
@ -981,7 +989,7 @@
"name": "icon-page", "name": "icon-page",
"prevSize": 24, "prevSize": 24,
"code": 60175, "code": 60175,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 130, "order": 130,
@ -989,7 +997,7 @@
"name": "icon-plot-overlay", "name": "icon-plot-overlay",
"prevSize": 24, "prevSize": 24,
"code": 60176, "code": 60176,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 80, "order": 80,
@ -997,7 +1005,7 @@
"name": "icon-plot-stacked", "name": "icon-plot-stacked",
"prevSize": 24, "prevSize": 24,
"code": 60177, "code": 60177,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 134, "order": 134,
@ -1005,7 +1013,7 @@
"name": "icon-session", "name": "icon-session",
"prevSize": 24, "prevSize": 24,
"code": 60178, "code": 60178,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 109, "order": 109,
@ -1013,7 +1021,7 @@
"name": "icon-tabular", "name": "icon-tabular",
"prevSize": 24, "prevSize": 24,
"code": 60179, "code": 60179,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 107, "order": 107,
@ -1021,7 +1029,7 @@
"name": "icon-tabular-lad", "name": "icon-tabular-lad",
"prevSize": 24, "prevSize": 24,
"code": 60180, "code": 60180,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 106, "order": 106,
@ -1029,7 +1037,7 @@
"name": "icon-tabular-lad-set", "name": "icon-tabular-lad-set",
"prevSize": 24, "prevSize": 24,
"code": 60181, "code": 60181,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 70, "order": 70,
@ -1037,7 +1045,7 @@
"name": "icon-tabular-realtime", "name": "icon-tabular-realtime",
"prevSize": 24, "prevSize": 24,
"code": 60182, "code": 60182,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 60, "order": 60,
@ -1045,7 +1053,7 @@
"name": "icon-tabular-scrolling", "name": "icon-tabular-scrolling",
"prevSize": 24, "prevSize": 24,
"code": 60183, "code": 60183,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 131, "order": 131,
@ -1053,7 +1061,7 @@
"name": "icon-telemetry", "name": "icon-telemetry",
"prevSize": 24, "prevSize": 24,
"code": 60184, "code": 60184,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 108, "order": 108,
@ -1061,7 +1069,7 @@
"name": "icon-timeline", "name": "icon-timeline",
"prevSize": 24, "prevSize": 24,
"code": 60185, "code": 60185,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 81, "order": 81,
@ -1069,7 +1077,7 @@
"name": "icon-timer", "name": "icon-timer",
"prevSize": 24, "prevSize": 24,
"code": 60186, "code": 60186,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 69, "order": 69,
@ -1077,7 +1085,7 @@
"name": "icon-topic", "name": "icon-topic",
"prevSize": 24, "prevSize": 24,
"code": 60187, "code": 60187,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 79, "order": 79,
@ -1085,7 +1093,7 @@
"name": "icon-box-with-dashed-lines-v2", "name": "icon-box-with-dashed-lines-v2",
"prevSize": 24, "prevSize": 24,
"code": 60188, "code": 60188,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 90, "order": 90,
@ -1093,7 +1101,7 @@
"name": "icon-summary-widget", "name": "icon-summary-widget",
"prevSize": 24, "prevSize": 24,
"code": 60189, "code": 60189,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 92, "order": 92,
@ -1101,7 +1109,7 @@
"name": "icon-notebook", "name": "icon-notebook",
"prevSize": 24, "prevSize": 24,
"code": 60190, "code": 60190,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 168, "order": 168,
@ -1109,7 +1117,7 @@
"name": "icon-tabs-view", "name": "icon-tabs-view",
"prevSize": 24, "prevSize": 24,
"code": 60191, "code": 60191,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 117, "order": 117,
@ -1117,7 +1125,7 @@
"name": "icon-flexible-layout", "name": "icon-flexible-layout",
"prevSize": 24, "prevSize": 24,
"code": 60192, "code": 60192,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 166, "order": 166,
@ -1125,7 +1133,7 @@
"name": "icon-generator-sine", "name": "icon-generator-sine",
"prevSize": 24, "prevSize": 24,
"code": 60193, "code": 60193,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 167, "order": 167,
@ -1133,7 +1141,7 @@
"name": "icon-generator-event", "name": "icon-generator-event",
"prevSize": 24, "prevSize": 24,
"code": 60194, "code": 60194,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 165, "order": 165,
@ -1141,7 +1149,7 @@
"name": "icon-gauge-v2", "name": "icon-gauge-v2",
"prevSize": 24, "prevSize": 24,
"code": 60195, "code": 60195,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 170, "order": 170,
@ -1149,7 +1157,7 @@
"name": "icon-spectra", "name": "icon-spectra",
"prevSize": 24, "prevSize": 24,
"code": 60196, "code": 60196,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 171, "order": 171,
@ -1157,7 +1165,7 @@
"name": "icon-telemetry-spectra", "name": "icon-telemetry-spectra",
"prevSize": 24, "prevSize": 24,
"code": 60197, "code": 60197,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 172, "order": 172,
@ -1165,7 +1173,7 @@
"name": "icon-pushbutton", "name": "icon-pushbutton",
"prevSize": 24, "prevSize": 24,
"code": 60198, "code": 60198,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 174, "order": 174,
@ -1173,7 +1181,7 @@
"name": "icon-conditional", "name": "icon-conditional",
"prevSize": 24, "prevSize": 24,
"code": 60199, "code": 60199,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 178, "order": 178,
@ -1181,7 +1189,7 @@
"name": "icon-condition-widget", "name": "icon-condition-widget",
"prevSize": 24, "prevSize": 24,
"code": 60200, "code": 60200,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 180, "order": 180,
@ -1189,7 +1197,7 @@
"name": "icon-alphanumeric", "name": "icon-alphanumeric",
"prevSize": 24, "prevSize": 24,
"code": 60201, "code": 60201,
"tempChar": "" "tempChar": ""
}, },
{ {
"order": 183, "order": 183,
@ -1197,7 +1205,7 @@
"name": "icon-image-telemetry", "name": "icon-image-telemetry",
"prevSize": 24, "prevSize": 24,
"code": 60202, "code": 60202,
"tempChar": "" "tempChar": ""
} }
], ],
"id": 0, "id": 0,
@ -2000,6 +2008,26 @@
] ]
} }
}, },
{
"id": 169,
"paths": [
"M1024 512c0 282.77-229.23 512-512 512s-512-229.23-512-512c0-282.77 229.23-512 512-512s512 229.23 512 512z"
],
"attrs": [
{}
],
"isMulticolor": false,
"isMulticolor2": false,
"grid": 16,
"tags": [
"icon-circle"
],
"colorPermutations": {
"12552552551": [
{}
]
}
},
{ {
"id": 105, "id": 105,
"paths": [ "paths": [

View File

@ -53,6 +53,7 @@
<glyph unicode="&#xe92b;" glyph-name="icon-eye-disabled" d="M209.46 223.32q-7.46 9.86-14.26 20.28c-14.737 21.984-27.741 47.184-37.759 73.847l-0.841 2.553c11.078 29.259 24.068 54.443 39.51 77.869l-0.91-1.469c23.221 34.963 50.705 64.8 82.207 89.793l0.793 0.607c57.663 45.719 130.179 75.053 209.311 79.947l1.069 0.053 114.48 140.88c-27.366 5.017-58.869 7.898-91.041 7.92h-0.019c-245.8 0-452.2-168-510.8-395.6 21.856-82.93 60.906-154.847 113.325-214.773l-0.525 0.613zM814.76 416.92q7.52-10 14.44-20.52c14.737-21.984 27.741-47.184 37.759-73.847l0.841-2.553c-10.859-29.216-23.863-54.416-39.447-77.748l0.847 1.348c-23.221-34.963-50.705-64.8-82.207-89.793l-0.793-0.607c-57.762-45.834-130.437-75.216-209.743-80.049l-1.057-0.051-114.46-140.86c27.346-4.988 58.817-7.84 90.955-7.84 0.037 0 0.074 0 0.111 0h-0.005c245.8 0 452.2 168 510.8 395.6-21.856 82.93-60.906 154.847-113.325 214.773l0.525-0.613zM832 832l-832-1024h192l832 1024h-192z" /> <glyph unicode="&#xe92b;" glyph-name="icon-eye-disabled" d="M209.46 223.32q-7.46 9.86-14.26 20.28c-14.737 21.984-27.741 47.184-37.759 73.847l-0.841 2.553c11.078 29.259 24.068 54.443 39.51 77.869l-0.91-1.469c23.221 34.963 50.705 64.8 82.207 89.793l0.793 0.607c57.663 45.719 130.179 75.053 209.311 79.947l1.069 0.053 114.48 140.88c-27.366 5.017-58.869 7.898-91.041 7.92h-0.019c-245.8 0-452.2-168-510.8-395.6 21.856-82.93 60.906-154.847 113.325-214.773l-0.525 0.613zM814.76 416.92q7.52-10 14.44-20.52c14.737-21.984 27.741-47.184 37.759-73.847l0.841-2.553c-10.859-29.216-23.863-54.416-39.447-77.748l0.847 1.348c-23.221-34.963-50.705-64.8-82.207-89.793l-0.793-0.607c-57.762-45.834-130.437-75.216-209.743-80.049l-1.057-0.051-114.46-140.86c27.346-4.988 58.817-7.84 90.955-7.84 0.037 0 0.074 0 0.111 0h-0.005c245.8 0 452.2 168 510.8 395.6-21.856 82.93-60.906 154.847-113.325 214.773l0.525-0.613zM832 832l-832-1024h192l832 1024h-192z" />
<glyph unicode="&#xe92c;" glyph-name="icon-notebook-page" d="M830 770h-830l-4-702c0-106.6 87.4-194 194-194h640c106.6 0 194 87.4 194 194v508c0 106.8-87.4 194-194 194zM832 386l-384-384-192 192v256l192-192 384 384v-256z" /> <glyph unicode="&#xe92c;" glyph-name="icon-notebook-page" d="M830 770h-830l-4-702c0-106.6 87.4-194 194-194h640c106.6 0 194 87.4 194 194v508c0 106.8-87.4 194-194 194zM832 386l-384-384-192 192v256l192-192 384 384v-256z" />
<glyph unicode="&#xe92d;" glyph-name="icon-unlocked" d="M768 832c-141.339-0.114-255.886-114.661-256-255.989v-128.011h-448c-35.301-0.113-63.887-28.699-64-63.989v-512.011c0.113-35.301 28.699-63.887 63.989-64h638.011c35.301 0.113 63.887 28.699 64 63.989v512.011c-0.113 35.301-28.699 63.887-63.989 64h-62.011v128c0 70.692 57.308 128 128 128s128-57.308 128-128v0-128h128v128c-0.114 141.339-114.661 255.886-255.989 256h-0.011z" /> <glyph unicode="&#xe92d;" glyph-name="icon-unlocked" d="M768 832c-141.339-0.114-255.886-114.661-256-255.989v-128.011h-448c-35.301-0.113-63.887-28.699-64-63.989v-512.011c0.113-35.301 28.699-63.887 63.989-64h638.011c35.301 0.113 63.887 28.699 64 63.989v512.011c-0.113 35.301-28.699 63.887-63.989 64h-62.011v128c0 70.692 57.308 128 128 128s128-57.308 128-128v0-128h128v128c-0.114 141.339-114.661 255.886-255.989 256h-0.011z" />
<glyph unicode="&#xe92e;" glyph-name="icon-circle" d="M1024 320c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 282.77 229.23 512 512 512s512-229.23 512-512z" />
<glyph unicode="&#xea00;" glyph-name="icon-arrows-right-left" d="M1024 320l-448-512v1024zM448 832l-448-512 448-512z" /> <glyph unicode="&#xea00;" glyph-name="icon-arrows-right-left" d="M1024 320l-448-512v1024zM448 832l-448-512 448-512z" />
<glyph unicode="&#xea01;" glyph-name="icon-arrows-up-down" d="M512 832l512-448h-1024zM0 256l512-448 512 448z" /> <glyph unicode="&#xea01;" glyph-name="icon-arrows-up-down" d="M512 832l512-448h-1024zM0 256l512-448 512 448z" />
<glyph unicode="&#xea02;" glyph-name="icon-bullet" d="M832 80c0-44-36-80-80-80h-480c-44 0-80 36-80 80v480c0 44 36 80 80 80h480c44 0 80-36 80-80v-480z" /> <glyph unicode="&#xea02;" glyph-name="icon-bullet" d="M832 80c0-44-36-80-80-80h-480c-44 0-80 36-80 80v480c0 44 36 80 80 80h480c44 0 80-36 80-80v-480z" />

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB