Merge pull request #82 from UnstableDesign/op-extensions

Op extensions

Author: Devendork

src/app/core/core.module.ts

@@ -114,7 +114,7 @@ import { AuthService } from './provider/auth.service';
         SignupComponent,
         ProfileComponent,
         EmailComponent
-    ],
+        ],
     providers: [
         PatternService,
         UploadService,

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; }
 
@@ -1501,7 +1500,7 @@ export class DraftviewerComponent implements OnInit {
 
      //cx.fillStyle = color;
      cx.fillStyle = color;
-     if(color != '#FFFFFF') cx.fillRect(left+j*base_dims.w + base_fill.x, top+i*base_dims.h + base_fill.y, base_fill.w, base_fill.h);
+     cx.fillRect(left+j*base_dims.w + base_fill.x, top+i*base_dims.h + base_fill.y, base_fill.w, base_fill.h);
 
 
   }
@@ -1559,7 +1558,15 @@ export class DraftviewerComponent implements OnInit {
   private redrawRow(y, i, cx) {
 
     for (var j = 0; j < this.weave.warps; j++) {
-      this.drawCell(this.cx, i, j, "drawdown");
+      //get the system at this warp
+      const sys_id = this.weave.colSystemMapping[j];
+      const sys = this.ss.getWarpSystem(sys_id)
+    
+      if(sys !== undefined && sys.isVisible()){
+        this.drawCell(this.cx, i, j, "drawdown");
+      }else{
+
+      } 
     }
   }
 
@@ -1992,6 +1999,9 @@ public drawWeftEnd(top, left, shuttle){
   public redrawYarnView(){
 
 
+    
+
+
     for(let i = 0; i < this.render.visibleRows.length; i++){
 
       let index_row = this.render.visibleRows[i];
@@ -2085,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");
     }
@@ -2140,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){
@@ -2171,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();
     }
 
@@ -2186,7 +2198,7 @@ public redraw(flags:any){
   public redrawDraft() {
 
     var base_dims = this.render.getCellDims("base");
-    this.cx.fillStyle = "white";
+    this.cx.fillStyle = "grey";
     this.cx.fillRect(base_dims.w,base_dims.h,this.canvasEl.width - base_dims.w*2,this.canvasEl.height-base_dims.h*2);
 
     var i,j;
@@ -2200,28 +2212,28 @@ public redraw(flags:any){
     }
 
 
-     for (var x = 0; x < this.weave.colShuttleMapping.length; x++) {
+    //  for (var x = 0; x < this.weave.colShuttleMapping.length; x++) {
 
-      let system;
+    //   let system;
 
-      var id = this.weave.colShuttleMapping[x];
-      if(id === undefined) system = this.ss.getFirstWarpSystem();
+    //   var id = this.weave.colShuttleMapping[x];
+    //   if(id === undefined) system = this.ss.getFirstWarpSystem();
 
-      else system = this.ss.getWarpSystem(id);
-      var shuttle = this.ms.getShuttle(id);
+    //   else system = this.ss.getWarpSystem(id);
+    //   var shuttle = this.ms.getShuttle(id);
 
 
-        if(system !== undefined && !system.visible){
-          var c = "#3d3d3d";
-          var t = 100;
+    //     if(system !== undefined && !system.visible){
+    //       var c = "#3d3d3d";
+    //       var t = 100;
 
-          var width = base_dims.w;
-          var w_margin = base_dims.w;
-          this.cx.fillStyle = c;
-          this.cx.fillRect(x*base_dims.w+w_margin, 0, width, base_dims.h*this.render.visibleRows.length);
+    //       var width = base_dims.w;
+    //       var w_margin = base_dims.w;
+    //       this.cx.fillStyle = c;
+    //       this.cx.fillRect(x*base_dims.w+w_margin, 0, width, base_dims.h*this.render.visibleRows.length);
 
-        }
-    }   
+    //     }
+    // }   
 
     this.drawGrid(this.cx,this.canvasEl);
 

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

@@ -27,7 +27,7 @@ export class InitModal implements OnInit {
   opts: StartOptions[] = [
       {value: 'example', viewValue: 'Load an Example', mixeronly: true},
       {value: 'ada', viewValue: 'AdaCAD (.ada) File', mixeronly: true},
-      {value: 'bmp', viewValue: 'Two Color Image (.bmp, .jpg, .png) File', mixeronly: false},
+     // {value: 'bmp', viewValue: 'Two Color Image (.bmp, .jpg, .png) File', mixeronly: false},
       // {value: 'wif', viewValue: 'WIF (.wif) File', mixeronly: false},   
       {value: 'new', viewValue: 'Empty Draft', mixeronly: false}
 
@@ -46,7 +46,6 @@ export class InitModal implements OnInit {
 
   constructor(
     private fls: FileService,
-    private auth: AuthService,
     private dm: DesignmodesService, 
     private http: HttpClient,
     private dialogRef: MatDialogRef<InitModal>, 
@@ -91,11 +90,9 @@ export class InitModal implements OnInit {
 
   }
 
-  // selectionMade(selection: any){
-  //   if(selection === 'recover'){
-  //     this.loadSavedFile();
-  //   }
-  // }
+  selectionMade(selection: any){
+
+  }
 
   loadExample(filename: string){
     console.log("loading example: ", filename);

src/app/core/modal/weaverview/weaverview.component.html

@@ -27,7 +27,7 @@
 
 
 
-   
+   <div class="yarns-and-back">
       <div class="view_slider">
         View Yarns
 
@@ -46,7 +46,7 @@
             (change)="front = !front; viewFront($event, front, 'front')">
         </mat-slide-toggle>
       </div>
-
+    </div>
       <!-- <div class="view_slider">
         View Crossings
         <mat-slide-toggle
@@ -55,35 +55,57 @@
         </mat-slide-toggle>
       </div> -->
 
-      <div class="system-viz">
 
-        <ng-container *ngIf="ss.weft_systems.length > 1">
-            <ng-container *ngFor="let system of ss.weft_systems">
-              <div class="view_slider">
+      <div class = "system-matrix">
+
+        <div class="system-row">
+        <div class = "system-activate">
+          show weft systems present on layer:
+        </div>
+        <div class = "warp-system">
+          warp systems
+         </div>
+        <div class = "weft-system">
+          weft systems
+        </div>
+
+      </div>
 
-              <mat-slide-toggle
-              [checked]="!system.visible"
-              (change)="system.visible = !system.visible; visibleButton(system.id, system.visible, 'weft')">
-            </mat-slide-toggle> Hide Weft System {{system.getChar()}}
-            </div>
-          </ng-container>
-        </ng-container>
+        <div *ngFor="let system_data of collective_systems;" class = "system-row">
 
-        <ng-container *ngIf="ss.warp_systems.length > 1">
 
-        <ng-container *ngFor="let system of ss.warp_systems">
-          <div class="view_slider">
+          <div class = "system-activate">
+            <button *ngIf="system_data.warp !== null" mat-stroked-button (click) = "showOnly(system_data.id)"> Layer {{system_data.id+1}}</button>
+          </div>
+
+          <div class = "warp-system">
+        
+            <mat-slide-toggle *ngIf="system_data.warp !== null"
+            [matTooltip]=  system_data.warp.name
+            [checked]="system_data.warp.visible"
+            (change)="system_data.warp.visible = !system_data.warp.visible; visibleButton(system_data.id, system_data.warp.visible, 'warp')">
+          </mat-slide-toggle>
+          </div>
 
-          <mat-slide-toggle
-          [checked]="!system.visible"
-          (change)="system.visible = !system.visible; visibleButton(system.id, system.visible, 'warp')">
-          </mat-slide-toggle> Hide Warp System {{system.getChar()}}
+          <div class = "weft-system">
+            <mat-slide-toggle *ngIf="system_data.weft !== null"
+            [matTooltip]=  system_data.weft.name
+            [checked]="system_data.weft.visible"
+            (change)="system_data.weft.visible = !system_data.weft.visible; visibleButton(system_data.id, system_data.weft.visible, 'weft')">
+          </mat-slide-toggle>
           </div>
-        </ng-container>
-        </ng-container>
+
+      
+
+        </div>
+
+
       </div>
 
 
+    
+
+
 
 </mat-dialog-content>
 <!-- <mat-dialog-actions>

src/app/core/modal/weaverview/weaverview.component.scss

@@ -14,14 +14,27 @@ h4{
 // 	margin: 14px 0 0; 
 // }
 
+
+
 .toprow{
   display: flex;
   flex-direction: row;
   line-height: 1em;
 }
 
+.mat-stroked-button{
+  border: 1px solid currentColor;
+  padding: 0px 11px;
+  line-height: 20px;
+  font-size: 0.8em;
+}
 
 
+.yarns-and-back{
+  display: flex;
+  font-size: .8em;
+}
+
 .view_slider{
   width: 100%;
   padding: 8px 0 16px 0;
@@ -30,6 +43,27 @@ h4{
   margin:auto;
 }
 
+.system-matrix{
+  display: flex;
+  flex-direction: column;
+  font-size: .8em;
+}
+
+.system-row{
+  display: flex;
+  flex-direction: row;
+  font-size: .8em;
+}
+
+.system-activate{
+  width: 50%;
+}
+
+.weft-system,
+.warp-system{
+  width: 25%;
+}
+
 // mat-slide-toggle{
 //     padding: 0px 8px;
 // }