gik composite view is happy

js/cells/DMACell.js

@@ -245,7 +245,7 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'globals', '
 
         switch(mode) {
             case "supercell":
-                if (!this.superCell && !this.cells) mode = "cell";//top level item
+                if (this._isTopLayerCell()) mode = "cell";//top level item
                 setVisiblity();
                 break;
             case "cell":
@@ -278,7 +278,7 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'globals', '
 
         function setVisiblity(){
             var visible = true;
-            if (mode == "supercell") visible = !(self.superCell && self.cells);//middle layers are always hidden in supercell mode
+            if (mode == "supercell") visible = !self._isMiddleLayer();//middle layers are always hidden in supercell mode
 
             _.each(self.object3D.children, function(child){
                 if (child.name == "object3D") return;
@@ -293,6 +293,15 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'globals', '
         }
     };
 
+    DMACell.prototype._isMiddleLayer = function(){
+        return false;
+    };
+
+    DMACell.prototype._isTopLayerCell = function(){
+        return this.superCell === null || this.superCell === undefined;
+    };
+
+
 
 
 

js/cells/supercells/DMASuperCell.js

@@ -95,6 +95,14 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'],
 
     };
 
+    DMASuperCell.prototype._isMiddleLayer = function(){
+        return this.superCell !== null && this.superCell !== undefined;
+    };
+
+    DMASuperCell.prototype._isTopLayerCell = function(){
+        return false;
+    };
+
 
 
 

js/cells/supercells/GIKSuperCell.js

@@ -61,6 +61,14 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'superCell',
         return "cell";
     };
 
+    GIKSuperCell.prototype._isMiddleLayer = function(){
+        return false;
+    };
+
+    GIKSuperCell.prototype._isTopLayerCell = function(){
+        return this.superCell === null || this.superCell === undefined;
+    };
+
     GIKSuperCell.prototype.toJSON = function(){
         var data = DMASuperCell.prototype.toJSON.call(this);
         if (!this.length) console.warn("no length assigned to gik supercell");

js/lattice/latticeSubclasses/GIKLattice.js

@@ -14,6 +14,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
             require([this.getHighlighterFile()], function(superCellHighlighter){
                 globals.highlighter = new superCellHighlighter();
             });
+            appState.set("superCellRange", new THREE.Vector3(appState.get("gikLength"), 1, 1));
         },
 
         getHighlighterFile: function(){

js/menus/CompositeMenuView.js

@@ -39,6 +39,11 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals', 'ma
             lattice.compositeEditor._changeRandomColor();
         },
 
+        getPropertyOwner: function($target){
+            if ($target.hasClass("compositeEditor")) return lattice.compositeEditor;
+            return null;
+        },
+
         updateHex: function(hex){
             //update hex without rendering
             $("#compositeColor").css("border-color", hex);