Merge pull request #48 from UnstableDesign/ml_datagen

Ml datagen

Author: Devendork

src/app/core/model/draft.ts

@@ -969,7 +969,7 @@ export class Draft{
    * @param i: the tieups array, j: the treadling array, the threading array
    * @returns (nothing) in the future - this can return the specific points to update on the draft
    */  
-  recalculateDraft(tieup, treadling, threading) {
+  recalculateDraft(tieup: Array<Array<boolean>>, treadling: Array<number>, threading: Array<number>) {
     for (var i = 0; i < treadling.length;i++) {
       var active_treadle = treadling[i];
       if (active_treadle != -1) {

src/app/core/topbar/topbar.component.html

@@ -19,29 +19,26 @@
 
 <span class="right">
 
-    <button mat-icon-button matTooltip ="print screen">
-      <a class="print-link" #printLink (click)="saveAsPrint($event)" mat-menu-item>
+    <button mat-icon-button matTooltip ="print screen" (click)="saveAsPrint()" >
       <i class="fas fa-print"></i>
-      </a> 
     </button>
 
 
   <button mat-icon-button 
   [matMenuTriggerFor]="downloadDropdown"
-  matTooltip ="save current file"
+  matTooltip ="export adacad workspace"
   >
     <i class="fas fa-download"></i>
   </button> 
     <mat-menu #downloadDropdown mat-raised-button>
-
-      <a #bmpLink (click)="saveAsBmp($event)" mat-menu-item> as Bitmap</a>
-      <a #adaLink (click)="saveAsAda($event)" mat-menu-item> as AdaCAD file</a>
-      <a #wifLink (click)="saveAsWif($event)" mat-menu-item> as Wif file</a>
+      <a  (click)="saveAsAda()" mat-menu-item> as AdaCAD workspace file</a>
+      <a  (click)="saveAsBmp()" mat-menu-item> export all visible drafts as bitmaps</a>
+      <a  (click)="saveAsWif()" mat-menu-item> export all visible drafts as .WIF files</a>
     </mat-menu>
 
 
      <button mat-icon-button="Open" 
-     matTooltip ="open or start a new draft"
+     matTooltip ="open a new workspace"
      (click)="openNewFileDialog(null)">
      <i class="fas fa-folder-open"></i>
     </button>

src/app/core/topbar/topbar.component.ts

@@ -28,36 +28,19 @@ export class TopbarComponent implements OnInit {
   @Input() loomtypes;
   @Input() density_units;
   @Input() source; 
-  
-  @ViewChild('bmpLink', {static: true}) bmpLink: any;
-  @ViewChild('adaLink', {static: true}) adaLink: any;
-  @ViewChild('wifLink', {static: true}) wifLink: any;
-  @ViewChild('printLink', {static: true}) printLink: any;
-
-  downloadBmp: ElementRef;
-  downloadAda: ElementRef;
-  downloadWif: ElementRef;
-  downloadPrint: ElementRef;
-
 
   constructor(private dialog: MatDialog) { }
 
   ngOnInit(){
   }
 
   ngAfterViewInit() {
-    if(this.source == 'weaver'){
-      this.downloadBmp = this.bmpLink._elementRef;
-      this.downloadWif = this.wifLink._elementRef;
-    }
-    this.downloadAda = this.adaLink._elementRef;
-    this.downloadPrint = this.printLink._elementRef;
+
   }
 
   public saveAsBmp(e: any) {
     var obj: any = {
       name: this.filename,
-      downloadLink: this.downloadBmp,
       type: "bmp"
     }
     console.log(obj);
@@ -67,7 +50,6 @@ export class TopbarComponent implements OnInit {
   public saveAsAda(e: any) {
     var obj: any = {
       name: this.filename,
-      downloadLink: this.downloadAda,
       type: "ada"
     }
     console.log(obj);
@@ -77,17 +59,14 @@ export class TopbarComponent implements OnInit {
   public saveAsWif(e: any) {
     var obj: any = {
       name: this.filename,
-      downloadLink: this.downloadWif,
       type: "wif"
     }
-    console.log(obj);
     this.onSave.emit(obj);
   }
 
   public saveAsPrint(e: any) {
     var obj: any = {
       name: this.filename,
-      downloadLink: this.downloadPrint,
       type: "jpg"
     }
     this.onSave.emit(obj);

src/app/mixer/mixer.component.ts

@@ -422,42 +422,28 @@ export class MixerComponent implements OnInit {
    * @param {Event} e - Press Control + x
    * @returns {void}
    */
-  // @HostListener('window:keydown.p', ['$event'])
-  // private keyEventPaste(e) {
-  //   this.onPaste({});
-  // }
-
-
-  // /**
-  //  * this is called when import has been called from the sidebar
-  //  * @param result 
-  //  */
-  // public draftUploaded(result: LoadResponse){
-
-  //   console.log("import", result);
-  //   const data: FileObj = result.data;
 
-  //   data.drafts.forEach().
-
-  //   const draft: Draft = new Draft(result);
-  //   this.palette.addSubdraftFromDraft(draft);
-  // }
 
   /**
    * this is called when a user pushes bring from the topbar
    * @param event 
-   * @todo add interface to select which draft to export if BMP or WIF
    */
-  public onSave(e: any){
+  public async onSave(e: any) : Promise<any>{
+
+    const link = document.createElement('a')
 
-    console.log(e);
-    let link = e.downloadLink.nativeElement;
 
     switch(e.type){
       case 'jpg': 
       link.href = this.fs.saver.jpg(this.palette.getPrintableCanvas(e));
       link.download = e.name + ".jpg";
       this.palette.clearCanvas();
+      link.click();
+
+      break;
+
+      case 'wif': 
+      this.palette.downloadVisibleDraftsAsWif();
       break;
 
       case 'ada': 
@@ -467,7 +453,16 @@ export class MixerComponent implements OnInit {
         [],
         false);
         link.download = e.name + ".ada";
+        link.click();
+      break;
+
+      case 'bmp':
+        this.palette.downloadVisibleDraftsAsBmp();
+      break;
     }
+    return Promise.resolve(null);
+
+
   }
 
   /**

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

@@ -35,6 +35,7 @@
     </button> 
     </div>
 
+
     <button 
     matTooltip= "Duplilcate"
     class="button is-small is-primary fa fa-clone"

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

@@ -83,6 +83,8 @@ export class OperationComponent implements OnInit {
 
    has_connections_in: boolean = false;
 
+   subdraft_visible: boolean = true;
+
   constructor(
     private operations: OperationService, 
     private dialog: MatDialog,
@@ -269,7 +271,6 @@ export class OperationComponent implements OnInit {
 
 
 
-
   dragStart($event: any) {
 
   }

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

@@ -340,6 +340,36 @@ export class PaletteComponent implements OnInit{
 
   }
 
+  /**
+   * this cycles through all subdrafts and calls the download call on any subdrafts
+   * who are currently visible. 
+   */
+  downloadVisibleDraftsAsBmp(){
+
+    const drafts: Array<SubdraftComponent> = this.tree.getDrafts();
+    const visible_drafts: Array<SubdraftComponent> = drafts.filter(el => el.draft_visible)
+    const functions: Array<Promise<any>> = visible_drafts.map(el => el.saveAsBmp());
+    Promise.all(functions).then(el =>
+      console.log("Downloaded "+functions.length+" files")
+    );
+
+  }
+  
+  /**
+   * this cycles through all subdrafts and calls the download call on any subdrafts
+   * who are currently visible. 
+   */
+   downloadVisibleDraftsAsWif(){
+
+    const drafts: Array<SubdraftComponent> = this.tree.getDrafts();
+    const visible_drafts: Array<SubdraftComponent> = drafts.filter(el => el.draft_visible)
+    const functions: Array<Promise<any>> = visible_drafts.map(el => el.saveAsWif());
+    Promise.all(functions).then(el =>
+      console.log("Downloaded "+functions.length+" files")
+    );
+
+  }
+  
 
 
   /**
@@ -675,31 +705,38 @@ export class PaletteComponent implements OnInit{
   }
 
   /**
+   * a subdraft can only have an operation for a parent
    * removes the subdraft sent to the function
    * updates the tree view_id's in response
    * @param id {number}  
 
    */
   removeSubdraft(id: number){
 
+    console.log("removing subdraft id", id);
+
     const parent_id = this.tree.getSubdraftParent(id);
 
-    //removoe the node but get alll the ops before it is removed 
+    //remove the node but get all the ops before it is removed 
     const ref:ViewRef = this.tree.getViewRef(id);
-    const inputs:Array<number> = this.tree.getNonCxnInputs(id);
+   // const inputs:Array<number> = this.tree.getNonCxnInputs(id);
 
-    inputs.forEach(input => {
-      if(this.tree.getType(input) == 'draft'){
-        const comp = <SubdraftComponent> this.tree.getComponent(input);
-        comp.has_active_connection = false;
-        comp.active_connection_order = 0;
-      }
-    })
+
+    //inputs will always be of type op
+    // inputs.forEach(input => {
+    //   console.log("inputs = ", this.tree.getType(input));
+    //   if(this.tree.getType(input) == 'draft'){
+    //     const comp = <SubdraftComponent> this.tree.getComponent(input);
+    //     comp.has_active_connection = false;
+    //     comp.active_connection_order = 0;
+    //   }
+    // })
 
     const downstream_ops:Array<number> = this.tree.getDownstreamOperations(id);
     this.tree.removeNode(id);
 
     const old_cxns:Array<number> = this.tree.getUnusuedConnections();
+    console.log("unused connection cxn ", old_cxns);
     old_cxns.forEach(cxn => {
       const cxn_view_ref = this.tree.getViewRef(cxn);
       this.removeFromViewContainer(cxn_view_ref);
@@ -711,25 +748,26 @@ export class PaletteComponent implements OnInit{
     this.removeFromViewContainer(ref);
     this.viewport.removeObj(id);
 
-    //if it has a parent, recursively call on its parent
-    if(parent_id != -1){
-      this.removeSubdraft(parent_id);
-    }
 
-    
+
+
+    // if the parent op has no children, remove the operation parent as well
+    if(parent_id != -1 && !this.tree.isParent(parent_id)){
+      this.removeOperation(parent_id);
+    }
 
   }
 
   /**
    * this function will
-   * 1. delete the associated output subdraft
+   * 1. delete the associated output subdrafts
    * 2. recompue downsteam operations
    * 3. delete all input + output connections
    * @param id 
    */
   removeOperation(id:number){
 
-    //removoe the node but get alll the ops before it is removed 
+    //remove the node but get alll the ops before it is removed 
     const ref:ViewRef = this.tree.getViewRef(id);
     const outputs:Array<number> = this.tree.getNonCxnOutputs(id);
 
@@ -738,20 +776,24 @@ export class PaletteComponent implements OnInit{
         const comp = <SubdraftComponent> this.tree.getComponent(output);
         comp.has_active_connection = false;
         comp.active_connection_order = 0;
-        comp.parent_id = 0;
+        comp.parent_id = -1;
       }
     })
 
     const downstream_ops:Array<number> = this.tree.getDownstreamOperations(id);
     this.tree.removeNode(id);
 
+
+
     const old_cxns:Array<number> = this.tree.getUnusuedConnections();
     old_cxns.forEach(cxn => {
       const cxn_view_ref = this.tree.getViewRef(cxn);
       this.removeFromViewContainer(cxn_view_ref);
       this.tree.removeNode(cxn);
     });    
 
+
+
     //calls manually here so that the affected branches can be pinged before the node is deleted 
     this.recalculateDownstreamDrafts(downstream_ops);
     this.removeFromViewContainer(ref);
@@ -1048,7 +1090,7 @@ export class PaletteComponent implements OnInit{
      }
 
    /**
-   * Deletes the subdraft that called this function.
+   * Duplicates the operation that called this function.
    */
     onDuplicateOpCalled(obj: any){
       console.log("duplicating "+obj.id);
@@ -1074,6 +1116,9 @@ export class PaletteComponent implements OnInit{
  }
 
 
+
+
+
      /**
    * Deletes the subdraft that called this function.
    */
@@ -1331,7 +1376,9 @@ recalculateDownstreamDrafts(downstream_ops:Array<number>){
    .then(draft_map =>  {
     const leftoffset: Point = {x: op.bounds.topleft.x, y: op.bounds.topleft.y};  
 
-    draft_map.forEach(el => {
+    console.log(draft_map);
+
+    draft_map.forEach((el, ndx) => {
       let sd:SubdraftComponent = null;
 
       if(el.component_id >= 0){
@@ -1341,7 +1388,7 @@ recalculateDownstreamDrafts(downstream_ops:Array<number>){
       }else{
         sd = this.createSubDraft(el. draft);
         op.addOutput({component_id: sd.id, draft:el.draft});
-        sd.setPosition({x: leftoffset.x, y: leftoffset.y + op.bounds.height});
+        sd.setPosition({x: leftoffset.x+(el.draft.warps+1)*ndx*this.scale, y: leftoffset.y + op.bounds.height});
         sd.setComponentSize(el.draft.warps * this.scale, el.draft.wefts * this.scale);
         sd.setParent(op.id);
         const interlacement = utilInstance.resolvePointToAbsoluteNdx(sd.bounds.topleft, this.scale);