shaft view fixes, inlets default to 0, recompute on delete operation

Author: Laura Devendorf

src/app/core/draftviewer/draftviewer.component.ts

@@ -292,7 +292,6 @@ export class DraftviewerComponent implements OnInit {
   //this is called anytime a new draft object is loaded. 
   onNewDraftLoaded() {  
     var dims = this.render.getCellDims("base");
-
     this.canvasEl.width = this.weave.warps * dims.w;
     this.canvasEl.height = this.weave.wefts * dims.h;
     this.threadingCanvas.width = this.weave.warps * dims.w;
@@ -1279,7 +1278,7 @@ export class DraftviewerComponent implements OnInit {
    * @returns {void}
    */
   private drawOnThreading( currentPos: Interlacement ) {
-
+    
 
     if (!this.cxThreading || !currentPos) { return; }
 
@@ -1563,7 +1562,7 @@ export class DraftviewerComponent implements OnInit {
       const sys_id = this.weave.colSystemMapping[j];
       const sys = this.ss.getWarpSystem(sys_id)
 
-      if(sys.isVisible()){
+      if(sys !== undefined && sys.isVisible()){
         this.drawCell(this.cx, i, j, "drawdown");
       }else{
 
@@ -2096,7 +2095,7 @@ public drawWeftEnd(top, left, shuttle){
     //else this.drawBlank(this.cxTieups,this.tieupsCanvas);
 
 
-
+    console.log("this.loom.threading", this.loom.threading);
     for (var j = 0; j < this.loom.threading.length; j++) {
       this.drawCell(this.cxThreading, this.loom.threading[j], j, "threading");
     }
@@ -2151,6 +2150,7 @@ public drawDrawdown(){
 //takes inputs about what, exactly to redraw
 public redraw(flags:any){
 
+
     var base_dims = this.render.getCellDims("base");
 
     if(flags.drawdown !== undefined){
@@ -2182,7 +2182,8 @@ public redraw(flags:any){
       this.drawWarpMaterials(this.cxWarpMaterials, this.warpMaterialsCanvas);
     }
 
-    if(flags.loom !== undefined && this.loom.isFrame()){
+  
+    if(flags.loom !== undefined){
        this.redrawLoom();
     }
 

src/app/core/provider/file.service.ts

@@ -221,7 +221,7 @@ export class FileService {
             node_id: data.node_id,
             name: data.name,
             params: data.params,
-            inlets: (data.inlets === undefined) ? [] : data.inlets 
+            inlets: (data.inlets === undefined) ? [0] : data.inlets 
           }
           return op;
         });

src/app/mixer/mixer.component.ts

@@ -316,7 +316,6 @@ export class MixerComponent implements OnInit {
       const internal_op = this.ops.getOp(op.name); 
       if(internal_op === undefined) return;
       const param_types = internal_op.params.map(el => el.type);
-      console.log(param_types, op.params);
       param_types.forEach((p, ndx) => {
         if(p === 'file') images_to_load.push(op.params[ndx]);
       });
@@ -416,7 +415,7 @@ export class MixerComponent implements OnInit {
         if(this.tree.hasParent(el.id)){
           el.draft = new Draft({warps: 1, wefts: 1, pattern: [[new Cell(false)]]});
         } else{
-       //   console.log("removing node ", el.id, el.type, this.tree.hasParent(el.id));
+          console.log("removing node ", el.id, el.type, this.tree.hasParent(el.id));
           this.tree.removeNode(el.id);
         } 
       })

src/app/mixer/modal/draftdetail/draftdetail.component.ts

@@ -66,14 +66,10 @@ export class DraftdetailComponent implements OnInit {
                this.ink = data.ink;
                this.loom = data.loom;
                this.viewonly = data.viewonly;
-               console.log('this.ink:', this.ink);
 
 
 
-          
-               
-    
-
+        
 
 
               // this.modal_height = (this.draft.wefts+20) * this.render.getCellDims('base').h;

src/app/mixer/modal/ops/ops.component.ts

@@ -53,7 +53,6 @@ export class OpsComponent implements OnInit {
   }
 
   addOpFromSearch(event: any){
-    console.log("event", event);
     //need to convert display name toname here
     const ndx = this.displaynames.findIndex(el => el === event.option.value);
     if(ndx !== -1){

src/app/mixer/palette/connection/connection.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
+import { i } from 'mathjs';
 import { Bounds, Point } from '../../../core/model/datatypes';
 import { TreeService } from '../../provider/tree.service';
 import { OperationComponent } from '../operation/operation.component';
@@ -93,8 +94,11 @@ export class ConnectionComponent implements OnInit {
       // get the inlet value 
       const ndx = this.tree.getInletOfCxn(to.id, this.id);
       if(ndx !== -1){
-        const left_offset = document.getElementById('inlet'+to.id+"-"+ndx).offsetLeft;
-        this.b_to = {x: to.bounds.topleft.x + left_offset*this.scale/this.default_cell_size, y: to.bounds.topleft.y}
+        const element = document.getElementById('inlet'+to.id+"-"+ndx);
+        if(element !== undefined && element !== null){
+          const left_offset = element.offsetLeft;
+          this.b_to = {x: to.bounds.topleft.x + left_offset*this.scale/this.default_cell_size, y: to.bounds.topleft.y}
+        }
       }
     }
 

src/app/mixer/palette/operation/operation.component.ts

@@ -162,8 +162,6 @@ export class OperationComponent implements OnInit {
         dynamic_value = graph_node.params[dynamic_param];
       }
 
-      console.log("inlet values", inlet_values)
-
 
       //if inlet values is greater than 1, then we need to load the existing values in
       if(inlet_values.length > 1){
@@ -209,7 +207,7 @@ export class OperationComponent implements OnInit {
       }
 
     }else{
-
+      console.log(graph_node.inlets);
       graph_node.inlets.forEach(inlet => {
         this.inlets.push(new FormControl(0));
       });
@@ -414,14 +412,17 @@ export class OperationComponent implements OnInit {
           case 'system':
             if(value > this.inlets.length){
               for(let i = this.inlets.length; i < value; i++){
+
                 if(type === 'number'){
                   this.inlets.push(new FormControl(i));
+                  opnode.inlets.push(i);
                 }else{
                   this.inlets.push(new FormControl(this.systems.weft_systems[i-1].name))
                   this.systems.weft_systems[i-1].in_use = true;
+                  opnode.inlets.push(i-1);
                 } 
-                opnode.inlets.push(i-1);
               }
+
             }else if(value < this.inlets.length){
               this.inlets.splice(value, this.inlets.length - value);
               opnode.inlets.splice(value,  opnode.inlets.length - value);

src/app/mixer/palette/palette.component.ts

@@ -802,7 +802,6 @@ export class PaletteComponent implements OnInit{
       this.viewport.removeObj(node.id);
     })
 
-
     outputs.forEach(out => {
       this.performAndUpdateDownstream(out);
     })
@@ -819,11 +818,21 @@ export class PaletteComponent implements OnInit{
 
     if(id === undefined) return;
 
-    const delted_nodes = this.tree.removeOperationNode(id);
+    const drafts_out = this.tree.getNonCxnOutputs(id);
+
+    const outputs:Array<number> = drafts_out.reduce((acc, el) => {
+      return acc.concat(this.tree.getNonCxnOutputs(el));
+    }, []);
 
+
+    const delted_nodes = this.tree.removeOperationNode(id);
     delted_nodes.forEach(node => {
       this.removeFromViewContainer(node.ref);
       this.viewport.removeObj(node.id);
+    });
+
+    outputs.forEach(out => {
+      this.performAndUpdateDownstream(out);
     })
 
   }

src/app/mixer/provider/operation.service.ts

@@ -341,7 +341,8 @@ export class OperationService {
             row.forEach((cell, j) =>{
                 const select_col = (factor_in_repeats === 1) ? j % op_input.drafts[select_array].warps : j;
                 if(op_input.drafts[select_array].hasCell(select_row, select_col)){
-                    cell.setHeddle(op_input.drafts[select_array].pattern[select_row][select_col].getHeddle());
+                    const pattern = op_input.drafts[select_array].pattern;
+                    cell.setHeddle(pattern[select_row][select_col].getHeddle());
                 }else{
                     cell.setHeddle(null);
                 }
@@ -669,63 +670,71 @@ export class OperationService {
     const selvedge: Operation = {
       name: 'selvedge',
       displayname: 'selvedge',  
-      dx: 'adds a selvedge of a user defined with both sides of the input draft. User can specify the number of row repeats in the selvedge',
+      dx: 'adds a selvedge of a user defined width (in ends) on both sides of the input draft. The second input functions as the selvedge pattern, and if none is selected, a selvedge is generated',
       params: [
         {name: 'width',
         type: 'number',
         min: 1,
         max: 100,
         value: 12,
         dx: "the width in warps of the selvedge"
-        },
-        {name: 'repeats',
-        type: 'number',
-        min: 1,
-        max: 100,
-        value: 1,
-        dx: "the number of pics to repeat each selvedge structure, usually equal to the number of shuttles thrown"
         }
       ],
-      max_inputs: 1,
+      max_inputs: 2,
       perform: (op_inputs: Array<OpInput>)=> {
         const op_input = op_inputs[0];
+        if(op_input.drafts.length == 0) return Promise.resolve([]);
+       
+        const num_systems = utilInstance.filterToUniqueValues(op_input.drafts[0].rowSystemMapping).length;
+        const height = 2*num_systems;
 
-        const height = 2*op_input.params[1];
 
-        const pattern:Array<Array<Cell>> = [];
-        for(let i = 0; i < height; i++){
-          pattern.push([]);
-          let alt: boolean =  i <op_input.params[1];
-          for(let j = 0; j < 2; j++){
-            pattern[i][j] = ((alt && j%2 ==0) || (!alt && j%2 ==1)) ? new Cell(true) : new Cell(false);
+        let pattern:Array<Array<Cell>> = [];
+        
+        if(op_input.drafts.length == 2){
+          pattern = op_input.drafts[1].pattern;
+        }else{
+          for(let i = 0; i < height; i++){
+            pattern.push([]);
+            let alt: boolean =  i <num_systems;
+            for(let j = 0; j < 2; j++){
+              pattern[i][j] = ((alt && j%2 ==0) || (!alt && j%2 ==1)) ? new Cell(true) : new Cell(false);
+            }
           }
         }
+        
+        
+ 
+        const input: Draft = op_input.drafts[0];
+        const d: Draft = new Draft({warps: input.warps +op_input.params[0]*2, wefts: input.wefts});
+            
+            
+        for(let i = 0; i < d.wefts; i++){
+          for(let j = 0; j < d.warps; j++){
+            if(j < op_input.params[0]){
+              //left selvedge
+              d.pattern[i][j].setHeddle(pattern[(i+1)%pattern.length][j%pattern[0].length].getHeddle());
 
-        let outputs: Array<Draft> = [];
-        if(op_input.drafts.length == 0){
-          const d: Draft = new Draft({warps:op_input.params[0]*2, wefts: height});
-          d.fill(pattern, 'original');
-          outputs.push(d);
-        }else{
-           outputs =op_input.drafts.map(input => {
-            const d: Draft = new Draft({warps: input.warps +op_input.params[0]*2, wefts: input.wefts});
-            d.fill(pattern, 'original');
-            if(op_input.drafts.length > 0){
-              this.transferSystemsAndShuttles(d,op_input.drafts,op_input.params, 'first');
-              d.gen_name = this.formatName(op_input.drafts, "sel")
+            }else if(j < op_input.params[0]+input.warps){
+              //pattern
+              d.pattern[i][j].setHeddle(input.pattern[i][j - op_input.params[0]].getHeddle());
+
+            }else{
+              //right selvedge
+              d.pattern[i][j].setHeddle(pattern[i%pattern.length][j%pattern[0].length].getHeddle());
 
             }
-            for(let i = 0; i < input.wefts; i++){
-              for(let j = 0; j < input.warps; j++){
-                d.pattern[i][j+op_input.params[0]].setHeddle(input.pattern[i][j].getHeddle()) ;
-              }
-            }
+          }
+        }
+
+        if(op_input.drafts.length > 0){
+          this.transferSystemsAndShuttles(d,op_input.drafts,op_input.params, 'first');
+          d.gen_name = this.formatName(op_input.drafts, "sel")
 
-            return d;
-          });
         }
 
-        return Promise.resolve(outputs);
+        
+        return Promise.resolve([d]);
       }        
     }
 
@@ -3028,8 +3037,7 @@ export class OperationService {
         total_warps = utilInstance.lcm(all_warps);
 
 
-        //create a map from layers to drafts
-        const section_draft_map: Array<any> = child_inputs.map(el => { return {section: el.params[0]-1, draft: el.drafts.shift()}}); 
+        const section_draft_map: Array<any> = child_inputs.map(el => { return {section: el.inlet-1, draft: el.drafts.shift()}}); 
         const first_draft: Draft = section_draft_map[0].draft;
 
         const d:Draft = new Draft({
@@ -3282,8 +3290,8 @@ export class OperationService {
     this.ops.push(shifty);
     this.ops.push(layer);
     this.ops.push(selvedge);
-    this.ops.push(bindweftfloats);
-    this.ops.push(bindwarpfloats);
+    // this.ops.push(bindweftfloats);
+    // this.ops.push(bindwarpfloats);
     this.ops.push(joinleft);
     this.ops.push(jointop);
     this.ops.push(slope);
@@ -3322,7 +3330,7 @@ export class OperationService {
     this.classification.push(
       {category: 'block design',
       dx: "1 input, 1 output, describes the arragements of regions in a weave. Fills region with input draft",
-      ops: [imagemap, rect, crop, trim, margin, tile]
+      ops: [rect, crop, trim, margin, tile]
     }
     );
     this.classification.push(
@@ -3334,7 +3342,7 @@ export class OperationService {
     this.classification.push(
         {category: 'combine',
         dx: "2 inputs, 1 output, operations take more than one input and integrate them into a single draft in some way",
-        ops: [interlace, splicein, assignlayers, layer,  fill, joinleft, dynamic_join_left, jointop]}
+        ops: [imagemap, interlace, splicein, assignlayers, layer,  fill, joinleft, dynamic_join_left, jointop]}
         );
 
      this.classification.push(

src/app/mixer/provider/tree.service.ts

@@ -113,6 +113,7 @@ export class TreeService {
   /** scan through nodes and return all that our valid */
   async validateNodes() : Promise<boolean>{
 
+
     const err_ops: Array<Node> = this.nodes
             .filter(el => el.type === "op")
             .filter(el => this.ops.getOp((<OpNode> el).name) === undefined)
@@ -126,6 +127,8 @@ export class TreeService {
 
     ///also check to see that all connections exist
     const cxns = this.getUnusuedConnections();
+    console.log("in validate nodes", cxns);
+
    // console.log("unusued connections found", cxns);
     cxns.forEach(el => this.removeNode(el));
 
@@ -445,11 +448,12 @@ export class TreeService {
 
    //filter out inputs that are matched to an index highter than what we offer
     const missing_inlets: Array<TreeNode> = inputs_to_op
-      .filter((el) => el.ndx >= opnode.inlets.length)
+      .filter((el) => el.ndx > opnode.inlets.length)
       .map(el => el.tn);
 
+
     const viewRefs = missing_inlets.map(el => el.node.ref);
-    console.log("IN SWEEP", inputs_to_op, opnode.inlets, missing_inlets);
+
 
     missing_inlets.forEach(el => {
         this.removeConnectionNode(el.inputs[0].tn.node.id, el.outputs[0].tn.node.id);
@@ -1010,6 +1014,7 @@ removeOperationNode(id:number) : Array<Node>{
   const deleted:Array<Node> = []; 
   if(cxn_id === undefined) return;
 
+  console.log("removeing node in connection")
   deleted.push(this.removeNode(cxn_id));
 
   return deleted;