Merge pull request #80 from UnstableDesign/op-extensions

Op extensions

Author: Devendork

src/app/app-routing.module.ts

@@ -2,17 +2,9 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { WeaverComponent } from './weaver/weaver.component';
 import { MixerComponent } from './mixer/mixer.component';
-import { LoginComponent } from './core/login/login.component';
-import { ProfileComponent } from './core/profile/profile.component';
-import { SignupComponent } from './core/signup/signup.component';
-import { EmailComponent } from './core/email/email.component';
+
 
 const routes: Routes = [
- // { path: '', redirectTo: 'login', pathMatch: 'full' },
-  // { path: 'login', component: LoginComponent },
-  // { path: 'email-login', component: EmailComponent },
-  // { path: 'signup', component: SignupComponent },
-  // { path: 'profile', component: ProfileComponent },
    {
      path: '',
      component: MixerComponent,

src/app/core/modal/init/init.modal.html

@@ -11,9 +11,9 @@ <h2 mat-dialog-title *ngIf="source === 'import'">Import Into Block</h2>
           <mat-label>Where would you like to begin?</mat-label>
         <mat-select [(value)]="selected" (selectionChange)="selectionMade(selected)">
 
-          <mat-option *ngIf="auth.isLoggedIn" value="recover">
+          <!-- <mat-option *ngIf="auth.isLoggedIn" value="recover">
             Recover Previous Workspace
-          </mat-option>
+          </mat-option> -->
 
           <mat-option *ngFor="let opt of opts" [value]="opt.value">
             {{opt.viewValue}}

src/app/core/modal/init/init.modal.ts

@@ -45,8 +45,8 @@ export class InitModal implements OnInit {
 
 
   constructor(
-    private auth: AuthService,
     private fls: FileService,
+    private auth: AuthService,
     private dm: DesignmodesService, 
     private http: HttpClient,
     private dialogRef: MatDialogRef<InitModal>, 
@@ -91,11 +91,11 @@ export class InitModal implements OnInit {
 
   }
 
-  selectionMade(selection: any){
-    if(selection === 'recover'){
-      this.loadSavedFile();
-    }
-  }
+  // selectionMade(selection: any){
+  //   if(selection === 'recover'){
+  //     this.loadSavedFile();
+  //   }
+  // }
 
   loadExample(filename: string){
     console.log("loading example: ", filename);
@@ -108,28 +108,7 @@ export class InitModal implements OnInit {
     }); 
   }
 
-  loadSavedFile(){
-    this.auth.user.subscribe(user => {
-      if(user !== null){
-
-        const db = fbref(getDatabase());
-
-
-        fbget(child(db, `users/${this.auth.uid}/ada`)).then((snapshot) => {
-          if (snapshot.exists()) {
-            this.fls.loader.ada("recovered draft", snapshot.val()).then(lr => {
-              this.dialogRef.close(lr)
-            });
-          }
-        }).catch((error) => {
-          console.error(error);
-        });
-  
-    }
-  
-});
-
-  }
+ 
 
 
 

src/app/mixer/mixer.component.html

@@ -7,6 +7,7 @@
   (onLoadNewFile)="loadNewFile($event);"
   (onClearScreen)="clearAll();"
   (onSave)="onSave($event);">
+
 </app-topbar>
 
 <mat-drawer-container #container class="mat-drawer-container" cdkScrollable>
@@ -97,3 +98,4 @@
 
 
 </mat-drawer-container>
+

src/app/mixer/mixer.component.ts

@@ -20,6 +20,8 @@ import { SystemsService } from '../core/provider/systems.service';
 import { HttpClient } from '@angular/common/http';
 import { InitModal } from '../core/modal/init/init.modal';
 import { MatDialog } from '@angular/material/dialog';
+import { AuthService } from '../core/provider/auth.service';
+import {getDatabase, ref as fbref, get as fbget, child} from '@angular/fire/database'
 
 
 //disables some angular checking mechanisms
@@ -70,6 +72,7 @@ export class MixerComponent implements OnInit {
    * dialog - Anglar Material dialog module. Used to control the popup modals.
    */
   constructor(public dm: DesignmodesService, 
+    private auth: AuthService,
     private ms: MaterialsService,
     private sys: SystemsService,
     private ps: PatternService, 
@@ -158,7 +161,6 @@ export class MixerComponent implements OnInit {
    */
    importNewFile(result: LoadResponse){
 
-    console.log("imported new file", result, result.data);
     this.processFileData(result.data).then(
       this.palette.changeDesignmode('move')
     );
@@ -291,7 +293,6 @@ export class MixerComponent implements OnInit {
         }
       });
 
-      console.log("seed nodes mapped ", seeds);
 
 
 
@@ -309,7 +310,7 @@ export class MixerComponent implements OnInit {
         return this.tree.validateNodes();
     })
     .then(el => {
-      console.log("performing top level ops");
+      //console.log("performing top level ops");
 
        return  this.tree.performTopLevelOps();
     })
@@ -321,7 +322,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);
         } 
       })
@@ -388,14 +389,72 @@ export class MixerComponent implements OnInit {
 
   ngAfterViewInit() {
 
-    const dialogRef = this.dialog.open(InitModal, {
-      data: {source: 'mixer'}
-    });
 
-    dialogRef.afterClosed().subscribe(loadResponse => {
-      if(loadResponse !== undefined) this.loadNewFile(loadResponse);
+      this.auth.user.subscribe(user => {
+
+        if(user === null){
+
+          const dialogRef = this.dialog.open(InitModal, {
+            data: {source: 'mixer'}
+          });
+
+
+          dialogRef.afterClosed().subscribe(loadResponse => {
+            if(loadResponse !== undefined) this.loadNewFile(loadResponse);
+      
+         });
+        }else{
+
+          //in the case someone logs in mid way through, don't replace their work. 
+          if(this.tree.nodes.length > 0) return;
+         
+
+          const db = fbref(getDatabase());
+
+
+                  fbget(child(db, `users/${this.auth.uid}/ada`)).then((snapshot) => {
+                    if (snapshot.exists()) {
+                      this.fs.loader.ada("recovered draft", snapshot.val()).then(lr => {
+                        this.loadNewFile(lr);
+                      });
+                    }
+                  }).catch((error) => {
+                    console.error(error);
+                  });
+
+        }
+      });
+  
+    console.log(this.auth, this.auth.isLoggedIn);
+
+
+
+
+
+
+  }
+
+
+  loadSavedFile(){
+  //   this.auth.user.subscribe(user => {
+  //       if(user !== null){
+
+  //         const db = fbref(getDatabase());
 
-   });
+
+  //         fbget(child(db, `users/${this.auth.uid}/ada`)).then((snapshot) => {
+  //           if (snapshot.exists()) {
+  //             this.fls.loader.ada("recovered draft", snapshot.val()).then(lr => {
+  //               this.dialogRef.close(lr)
+  //             });
+  //           }
+  //         }).catch((error) => {
+  //           console.error(error);
+  //         });
+    
+  //     }
+    
+  // });
 
   }
 

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

@@ -80,8 +80,10 @@
 
         <div class="param-name">{{param.name}}</div>
 
-
-        <div *ngIf="param.max > 1" class="param-slider">
+        <ng-container  *ngIf="param.type == 'number'">
+        <div class="param-slider">
+         
+         
             <mat-slider 
             thumbLabel
             tickInterval="1"
@@ -96,7 +98,7 @@
         </div>
 
 
-         <div *ngIf="param.max > 1" class='param-label'>
+         <div class='param-label'>
             <input 
             [formControl]="op_inputs[i]"
             [matTooltip]=param.dx
@@ -110,16 +112,38 @@
           >
 
         </div>
-
-        <div *ngIf="param.max === 1" class="param-checkbox">
-            <mat-checkbox 
-            [formControl]="op_inputs[i]"
-            [matTooltip]=param.dx
-            value="op_inputs[i].value"
-            (change)= "onCheckboxParamChange(i, op_inputs[i].value)">
-        </mat-checkbox>
-        </div>
-
+      </ng-container>
+
+      <ng-container  *ngIf="param.type == 'boolean'">
+
+            <div class="param-checkbox">
+                <mat-checkbox 
+                [formControl]="op_inputs[i]"
+                [matTooltip]=param.dx
+                value="op_inputs[i].value"
+                (change)= "onCheckboxParamChange(i, op_inputs[i].value)">
+                </mat-checkbox>
+            </div>
+        </ng-container>
+
+        <ng-container  *ngIf="param.type == 'string'">
+           
+    
+             <div class='param-label'>
+                <input 
+                [formControl]="op_inputs[i]"
+                [matTooltip]=param.dx
+                type = "text"
+                [name]=param.name
+                [min]=param.min
+                [max]=param.max
+                step = 1
+                value = op_inputs[i].value
+                (change)= "onParamChange(i, op_inputs[i].value)"
+              >
+      
+            </div>
+          </ng-container>
     </div>
     </ng-container>
     </div>

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

@@ -102,12 +102,14 @@
 
 
 				<div class='dims_and_name'>
-					<div><input matInput [(ngModel)]="tree.getDraft(id).ud_name" [placeholder]="tree.getDraft(id).gen_name"  (focusout)="nameFocusOut($event)"> </div>
+					<div><input matInput [(ngModel)]="tree.getDraft(id).ud_name" 
+						[placeholder]="tree.getDraft(id).gen_name"  
+						(focusout)="nameFocusOut($event)">
+					 </div>
 					<div class="dims">{{tree.getDraft(id).warps}} x {{tree.getDraft(id).wefts}} </div>
 					<div *ngIf="gl.type === 'frame' && (gl.min_frames < tree.getLoom(id).num_frames || gl.min_treadles < tree.getLoom(id).num_treadles) "class="frame">
 						<span class="error">
 							<i matTooltip="This draft requires more than the {{gl.min_frames}} frames or {{gl.min_treadles}} treadles than you have specified for your loom" class="fas fa-exclamation-circle"></i> 
-						
 							{{tree.getLoom(id).num_frames}} frames,  {{tree.getLoom(id).num_treadles}} treadles</span></div>
 
 

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

@@ -174,6 +174,7 @@ export class SubdraftComponent implements OnInit {
     this.canvas = <HTMLCanvasElement> document.getElementById(this.id.toString());
     this.cx = this.canvas.getContext("2d");
     this.drawDraft(this.draft); //force call here because it likely didn't render previously. 
+
     this.rescale();
     this.updateViewport(this.bounds);