@abi-software/scaffoldvuer 0.1.56 → 0.1.58

package/src/scripts/organsRenderer.js

@@ -9,12 +9,15 @@ const OrgansSceneData = function() {
   this.currentSpecies  = "";
   this.metaURL = "";
   this.viewURL = "";
+  this.currentTime = 0.0;
+  this.timeVarying = false;
+}
+
+const PrimitiveData = function () {
   this.geometries = [];
   this.lines = [];
   this.glyphsets = [];
   this.pointsets = [];
-  this.currentTime = 0.0;
-  this.timeVarying = false;
 }
 
 /**
@@ -36,6 +39,7 @@ const OrgansSceneData = function() {
   const _this = this;
 	let pickerScene = undefined;
 	this.sceneData = new OrgansSceneData();
+  this.primitiveData = new PrimitiveData();
 	const timeChangedCallbacks = new Array();
 	const sceneChangedCallbacks = new Array();
   const organPartAddedCallbacks = new Array();
@@ -350,15 +354,15 @@ const OrgansSceneData = function() {
 		}
 	}
 
-	const addOrganPartToSceneData = function(zincObject) {
+	const addOrganPartToPrimitiveData = function(zincObject) {
     if (zincObject.isGeometry) {
-      _this.sceneData.geometries.push(zincObject);
+      _this.primitiveData.geometries.push(zincObject);
     } else if (zincObject.isGlyphset) {
-      _this.sceneData.glyphsets.push(zincObject);
+      _this.primitiveData.glyphsets.push(zincObject);
     } else if (zincObject.isLines) {
-      _this.sceneData.lines.push(zincObject);
+      _this.primitiveData.lines.push(zincObject);
     } else if (zincObject.isPointset) {
-      _this.sceneData.pointsets.push(zincObject);
+      _this.primitiveData.pointsets.push(zincObject);
     }
 	}
 
@@ -368,7 +372,7 @@ const OrgansSceneData = function() {
     }
     if (useDefautColour)
       modelsLoader.setGeometryColour(zincObject, systemName, partName);
-    addOrganPartToSceneData(zincObject);
+    addOrganPartToPrimitiveData(zincObject);
 		const annotation = new (require('./annotation').annotation)();
     const region = zincObject.region.getFullPath();
 		annotation.data = {species:_this.sceneData.currentSpecies, system:systemName,
@@ -458,10 +462,10 @@ const OrgansSceneData = function() {
       _this.sceneData.currentSystem = systemName;
 			_this.sceneData.currentPart = partName;
 			_this.sceneData.currentTime = 0.0;
-			_this.sceneData.geometries.splice(0);
-			_this.sceneData.lines.splice(0);
-			_this.sceneData.glyphsets.splice(0);
-			_this.sceneData.pointsets.splice(0);
+			_this.primitiveData.geometries.splice(0);
+			_this.primitiveData.lines.splice(0);
+			_this.primitiveData.glyphsets.splice(0);
+			_this.primitiveData.pointsets.splice(0);
 			_this.sceneData.timeVarying = false;
       // This is used as title
       let name = "";

package/src/scripts/utilities.js

@@ -18,14 +18,18 @@ export const extractAllIds = (item, list) => {
     item.children.forEach(child => extractAllIds(child, list));
 }
 
-export const findObjectsWithNames = (rootRegion, names, regionPath) => {
+export const findObjectsWithNames = (rootRegion, names, regionPath, transverse) => {
   let targetRegion = rootRegion;
   const targetObjects = [];
   if (regionPath)
     targetRegion = rootRegion.findChildFromPath(regionPath);
   if (targetRegion) {
-    names.forEach(name => {
-      const temp = targetRegion.findObjectsWithGroupName(name, true);
+    const isArray = Array.isArray(names);
+    let array = names;
+    if (!isArray)
+      array = [array];
+      array.forEach(name => {
+      const temp = targetRegion.findObjectsWithGroupName(name, transverse);
       targetObjects.push(...temp);
     });
   }

package/src/components/TraditionalControls.vue

@@ -1,544 +0,0 @@
-<template>
-  <div
-    class="traditional-location"
-    :class="{ open: drawerOpen, close: !drawerOpen }"
-  >
-    <div class="traditional-container">
-      <el-row>
-        <el-col :span="12">
-          <div class="regions-display-text">
-            Regions
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <el-checkbox
-            v-model="checkAll"
-            class="all-checkbox"
-            :indeterminate="isIndeterminate"
-            @change="handleCheckAllChange"
-          >
-            Display all
-          </el-checkbox>
-        </el-col>
-      </el-row>
-      <el-checkbox-group
-        v-model="checkedItems"
-        size="small"
-        class="checkbox-group"
-        @change="handleCheckedItemsChange"
-      >
-        <div class="checkbox-group-inner">
-          <el-row
-            v-for="item in sortedPrimitiveGroups"
-            :key="item"
-            :label="item"
-          >
-            <div class="checkbox-container">
-              <el-checkbox
-                class="my-checkbox"
-                :label="item"
-                :checked="true"
-                :class="{ activeItem: activeRegion === item, 
-                          hoverItem: hoverRegion === item }"
-                @click.native="itemClicked(item, $event)"
-                @change="visibilityToggle(item, $event)"
-                @mouseover.native="checkboxHover(item)"
-              >
-                <el-color-picker
-                  :class="{ 'show-picker' : showColourPicker }"
-                  :value="getColour(item)"
-                  size="small"
-                  :popper-class="myPopperClass"
-                  @change="setColour(item, $event)"
-                />
-                {{ item }}
-              </el-checkbox>
-            </div>
-          </el-row>
-        </div>
-      </el-checkbox-group>
-    </div>
-    <div
-      class="drawer-button"
-      :class="{ open: drawerOpen, close: !drawerOpen }"
-      @click="toggleDrawer"
-    >
-      <i class="el-icon-arrow-left" />
-    </div>
-  </div>
-</template>
-
-<script>
-/* eslint-disable no-alert, no-console */
-import Vue from "vue";
-import { Checkbox, CheckboxGroup, ColorPicker, Row } from "element-ui";
-import lang from "element-ui/lib/locale/lang/en";
-import locale from "element-ui/lib/locale";
-
-const orderBy = require("lodash/orderBy");
-const uniq = require("lodash/uniq");
-locale.use(lang);
-Vue.use(Checkbox);
-Vue.use(CheckboxGroup);
-Vue.use(ColorPicker);
-Vue.use(Row);
-
-/**
- * A vue component for toggling visibility of various regions.
- */
-export default {
-  name: "TraditionalControls",
-  props: {
-    /**
-     * @ignore
-     */
-    module: {
-      type: Object,
-      default: undefined
-    },
-    /**
-     * Enable/disable colour picker
-     */
-    showColourPicker: Boolean
-  },
-  data: function() {
-    return {
-      checkAll: true,
-      isIndeterminate: false,
-      checkedItems: [],
-      sortedPrimitiveGroups: [],
-      activeRegion: "",
-      hoverRegion: "",
-      myPopperClass: "hide-scaffold-colour-popup",
-      drawerOpen: true
-    };
-  },
-  watch: {
-    showColourPicker: {
-      immediate: true,
-      handler: function() {
-        if (this.showColourPicker) this.myPopperClass = "showPicker";
-        else this.myPopperClass = "hide-scaffold-colour-popup";
-      }
-    }
-  },
-  created: function() {
-    let tmpArray = this.module.sceneData.geometries.concat(
-      this.module.sceneData.lines
-    );
-    tmpArray = tmpArray.concat(this.module.sceneData.glyphsets);
-    tmpArray = uniq(tmpArray.concat(this.module.sceneData.pointset));
-    this.sortedPrimitiveGroups = orderBy(tmpArray);
-    this.module.addOrganPartAddedCallback(this.organsAdded);
-  },
-  destroyed: function() {
-    this.sortedPrimitiveGroups = undefined;
-  },
-  methods: {
-    /**
-     * This is called when a new organ is read into the scene.
-     */
-    organsAdded: function(name) {
-      if (name && name != "") {
-        let tmpArray = uniq(this.sortedPrimitiveGroups.concat([name]));
-        tmpArray = orderBy(tmpArray);
-        const index = tmpArray.indexOf(undefined);
-        if (index > -1) {
-          tmpArray.splice(index, 1);
-        }
-        this.sortedPrimitiveGroups = tmpArray;
-      }
-    },
-    /**
-     * Select a region by its name.
-     */
-    changeActiveByNames: function(names, propagate) {
-      let targetObject = this.getFirstZincObjectWithGroupName(name);
-      if (targetObject && targetObject.getVisibility()) {
-        this.activeRegion = name;
-        this.$emit("object-selected", targetObject, propagate);
-      } else {
-        this.removeActive(propagate);
-      }
-      this.removeHover(propagate);
-    },
-    /**
-     * Hover a region by its name.
-     */
-    changeHoverByName: function(name, propagate) {
-      let targetObject = this.getFirstZincObjectWithGroupName(name);
-      if (targetObject) {
-        this.hoverRegion = name;
-        this.$emit("object-hovered", targetObject, propagate);
-      } else {
-        this.removeHover(propagate);
-      }
-    },
-    /**
-     * Unselect the current selected region.
-     */
-    removeActive: function(propagate) {
-      this.activeRegion = "";
-      this.$emit("object-selected", undefined, propagate);
-    },
-    /**
-     * Unselect the current hover region.
-     */
-    removeHover: function(propagate) {
-      this.hoverRegion = "";
-      this.$emit("object-hovered", undefined, propagate);
-    },
-    /**
-     * Reset the controls.
-     */
-    clear: function() {
-      this.sortedPrimitiveGroups = [];
-      this.checkedItems = [];
-      this.checkAll = true;
-      this.isIndeterminate = false;
-      this.activeRegion = "";
-      this.hoverRegion = "";
-      this.$emit("object-selected", undefined);
-    },
-    getFirstZincObjectWithGroupName: function(name) {
-      if (this.module && this.module.scene) {
-        let array = this.module.scene.findGeometriesWithGroupName(name);
-        if (array.length > 0) return array[0];
-        array = this.module.scene.findGlyphsetsWithGroupName(name);
-        if (array.length > 0) return array[0];
-        array = this.module.scene.findLinesWithGroupName(name);
-        if (array.length > 0) return array[0];
-        array = this.module.scene.findPointsetsWithGroupName(name);
-        if (array.length > 0) return array[0];
-      }
-      return undefined;
-    },
-    getColour: function(name) {
-      let graphic = this.getFirstZincObjectWithGroupName(name);
-      if (graphic) {
-        let hex = graphic.getColourHex();
-        if (hex) return "#" + hex;
-      }
-      return "#FFFFFF";
-    },
-    setColour: function(name, value) {
-      let graphic = this.getFirstZincObjectWithGroupName(name);
-      if (graphic) {
-        let hexString = value.replace("#", "0x");
-        graphic.setColourHex(hexString);
-      }
-    },
-    checkboxHover: function(name) {
-      this.changeHoverByName(name, true);
-    },
-    itemClicked: function(name, event) {
-      if (
-        !(
-          event.target.classList.contains("el-checkbox__inner") ||
-          event.target.classList.contains("el-checkbox__original")
-        )
-      ) {
-        this.changeActiveByNames([name], true);
-        event.preventDefault();
-      }
-    },
-    handleCheckedItemsChange: function() {
-      let unnamed = this.checkedItems.includes(undefined) ? true: false;
-      let checkedCount = this.checkedItems.length;
-      if (unnamed)
-        checkedCount--;
-      this.checkAll = checkedCount === this.sortedPrimitiveGroups.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.sortedPrimitiveGroups.length;
-    },
-    handleCheckAllChange(val) {
-      this.checkedItems = val ? [...this.sortedPrimitiveGroups] : [];
-      this.isIndeterminate = false;
-      for (let i = 0; i < this.sortedPrimitiveGroups.length; i++) {
-        this.visibilityToggle(this.sortedPrimitiveGroups[i], this.checkAll);
-      }
-    },
-    viewAll: function() {
-      this.module.viewAll();
-    },
-    visibilityToggle: function(item, event) {
-      this.module.changeOrganPartsVisibility(item, event);
-      if (event == false) {
-        if (this.activeRegion === item) {
-          this.removeActive(true);
-        }
-        if (this.hoverRegion === item) {
-          this.removeHover(true);
-        }
-      }
-    },
-    toggleDrawer: function() {
-      this.drawerOpen = !this.drawerOpen;
-      this.$emit("drawer-toggled", this.drawerOpen);
-    },
-    getState: function() {
-      if (this.checkAll) {
-        return { checkAll: true };
-      }
-      let checkedItems = [...this.checkedItems];
-      const index = checkedItems.indexOf(undefined);
-      if (index > -1) {
-        checkedItems.splice(index, 1);
-      }
-      return { checkedItems: checkedItems };
-    },
-    setState: function(state) {
-      if (state) {
-        if (state.checkAll) {
-          this.checkedItems = [...this.sortedPrimitiveGroups];
-          for (let i = 0; i < this.sortedPrimitiveGroups.length; i++) {
-            this.module.changeOrganPartsVisibility(
-              this.sortedPrimitiveGroups[i],
-              true
-            );
-          }
-        } else if (state.checkedItems) { 
-          this.checkedItems = [...state.checkedItems];
-          for (let i = 0; i < this.sortedPrimitiveGroups.length; i++) {
-            let visible = this.checkedItems.includes(
-              this.sortedPrimitiveGroups[i]);
-            this.module.changeOrganPartsVisibility(
-              this.sortedPrimitiveGroups[i],
-              visible
-            );
-          }
-        }
-      }
-      this.handleCheckedItemsChange();
-    }
-  }
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-@import "~element-ui/packages/theme-chalk/src/checkbox";
-@import "~element-ui/packages/theme-chalk/src/checkbox-group";
-@import "~element-ui/packages/theme-chalk/src/color-picker";
-@import "~element-ui/packages/theme-chalk/src/row";
-
-.checkbox-container {
-  display: flex;
-  cursor: pointer;
-}
-
-.traditional-location {
-  position: absolute;
-  bottom: 0px;
-  transition: all 1s ease;
-
-  &:focus{
-    outline: none;
-  }
-  &.open {
-    left: 0px;
-    .traditional-container {
-      opacity: 1;
-    }
-  }
-  &.close {
-    left: -298px;
-    .traditional-container {
-      pointer-events:none;
-      opacity: 0;
-    }
-  }
-}
-
-.traditional-container {
-  transition: all 1s ease;
-  float: left;
-  padding-left: 16px;
-  padding-right: 18px;
-  max-height: calc(100% - 154px);
-  text-align: left;
-  overflow: none;
-  border: 1px solid rgb(220, 223, 230);
-  padding-top: 7px;
-  padding-bottom: 16px;
-  background: #ffffff;
-}
-
-.regions-display-text {
-  width: 59px;
-  height: 20px;
-  color: rgb(48, 49, 51);
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-  margin-left: 8px;
-}
-
-.all-checkbox {
-  float: right;
-}
-
-.checkbox-group {
-  width: 260px;
-  border: 1px solid rgb(144, 147, 153);
-  border-radius: 4px;
-  background: #ffffff;
-  margin-top: 6px;
-}
-
-.checkbox-group-inner {
-  padding: 18px;
-  max-height: 240px;
-  min-height: 130px;
-  overflow: auto;
-  scrollbar-color: #c0c4cc rgba(1, 1, 1, 0);
-  scrollbar-width: thin;
-
-  &::-webkit-scrollbar {
-    width: 4px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    box-shadow: inset 0 0 6px #c0c4cc;
-  }
-}
-
-::v-deep .el-checkbox__input {
-  &.is-indeterminate, &.is-checked {
-    .el-checkbox__inner {
-      background-color: $app-primary-color;
-      border-color: $app-primary-color;
-    }
-  }
-}
-
-::v-deep .el-color-picker__color {
-  border: 1px solid $app-primary-color;
-}
-
-::v-deep .el-checkbox__label {
-  padding-left: 5px;
-  color: $app-primary-color !important;
-  font-size: 12px;
-  font-weight: 500;
-  letter-spacing: 0px;
-  line-height: 14px;
-}
-
-.activeItem {
-  background-color: #bbb !important;
-}
-
-.my-checkbox {
-  background-color: #fff;
-  width: 100%;
-
-  ::v-deep .el-color-picker {
-    height: 16px !important;
-    top: 3px;
-  }
-
-  ::v-deep .el-color-picker__trigger {
-    margin-left: 8px;
-    margin-right: 8px;
-    padding: 0px;
-    height: 16px;
-    width: 16px;
-    border: 0px;
-  }
-
-}
-
-.hoverItem {
-  background-color: #eee !important;
-}
-
-::v-deep .el-color-picker__icon {
-  &.el-icon-arrow-down {
-    display: none;
-  }
-}
-
-::v-deep .show-picker {
-  .el-color-picker__icon {
-    &.el-icon-arrow-down {
-      display: block;
-    }
-  }
-}
-
-::v-deep .my-drawer {
-  background: rgba(0, 0, 0, 0);
-  box-shadow: none;
-}
-
-.drawer {
-  ::v-deep .el-drawer:focus {
-    outline: none;
-  }
-}
-
-.open-drawer {
-  width: 20px;
-  height: 40px;
-  z-index: 8;
-  position: absolute;
-  left: 0px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
-  border: solid 1px #e4e7ed;
-  background-color: #f7faff;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  pointer-events: auto;
-}
-
-.drawer-button {
-  float: left;
-  width: 20px;
-  height: 40px;
-  z-index: 8;
-  margin-top: calc(50% - 52px);
-  border: solid 1px #e4e7ed;
-  border-left: 0;
-  background-color: #ffffff;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  pointer-events: auto;
-}
-
-.drawer-button {
-  i {
-    margin-top: 12px;
-    color: $app-primary-color;
-    transition-delay: 0.9s;
-  }
-  &.open {
-    i {
-      transform: rotate(0deg) scaleY(2.5);
-    }
-  }
-  &.close {
-    i {
-      transform: rotate(180deg) scaleY(2.5);   
-    }
-  }
-}
-
-.drawer-button.open i {
-  transform: rotate(0deg) scaleY(2.5);
-}
-
-.drawer-button.close i {
-  transform: rotate(180deg) scaleY(2.5);
-}
-</style>
-
-<style>
-.hide-scaffold-colour-popup {
-  display: none;
-}
-</style>
-