Skip to content

Commit fdff0cb

Browse files
DevendorkDevendork
authored
Merge pull request #42 from UnstableDesign/yarnsim
Version 3.0
2 parents 2046210 + fc28e88 commit fdff0cb

File tree

133 files changed

+5832
-5617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+5832
-5617
lines changed

‎src/app/app-routing.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import { MixerComponent } from './mixer/mixer.component';
66

77
const routes: Routes = [
88
{
9-
path: 'mixer',
9+
path: '',
1010
component: MixerComponent,
1111
children: []
1212
},
1313
{
14-
path: '',
14+
path: 'weaver',
1515
component: WeaverComponent,
1616
children: []
1717
}

‎src/app/core/core.module.ts‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,19 @@ import { UploadService } from './uploads/upload.service';
3636
import { FilterPipe } from './pipe/filter.pipe';
3737
import { UploadFormComponent } from './uploads/upload-form/upload-form.component';
3838
import { TopbarComponent } from './topbar/topbar.component';
39-
import { SystemsComponent} from './tool/systems/systems.component'
40-
import { MaterialsComponent} from './tool/materials/materials.component'
41-
import { NotesComponent} from './tool/notes/notes.component'
39+
import { ActionsComponent} from './modal/actions/actions.component'
4240
import { InitModal } from './modal/init/init.modal';
4341
import { AboutModal } from './modal/about/about.modal';
4442
import { PatternModal } from './modal/pattern/pattern.modal';
4543
import { MaterialModal } from './modal/material/material.modal';
4644
import { FileService } from './provider/file.service';
4745
import { ShuttlesModal } from './modal/shuttles/shuttles.modal';
48-
import { PatternsComponent } from './tool/patterns/patterns.component';
4946
import { DraftviewerComponent } from './draftviewer/draftviewer.component';
50-
47+
import { WeaverViewComponent } from './modal/weaverview/weaverview.component';
48+
import { SelectionComponent } from './draftviewer/selection/selection.component';
49+
import { SidebarComponent } from './sidebar/sidebar.component';
50+
import { LoomModal } from './modal/loom/loom.modal';
51+
import { Action } from 'rxjs/internal/scheduler/Action';
5152

5253
@NgModule({
5354
imports: [
@@ -87,16 +88,17 @@ import { DraftviewerComponent } from './draftviewer/draftviewer.component';
8788
FilterPipe,
8889
UploadFormComponent,
8990
TopbarComponent,
90-
SystemsComponent,
91-
MaterialsComponent,
92-
NotesComponent,
91+
ActionsComponent,
9392
PatternModal,
9493
ShuttlesModal,
9594
InitModal,
9695
AboutModal,
9796
MaterialModal,
98-
PatternsComponent,
99-
DraftviewerComponent
97+
LoomModal,
98+
DraftviewerComponent,
99+
SelectionComponent,
100+
SidebarComponent,
101+
WeaverViewComponent
100102
],
101103

102104
providers: [
@@ -138,20 +140,26 @@ import { DraftviewerComponent } from './draftviewer/draftviewer.component';
138140
FilterPipe,
139141
UploadFormComponent,
140142
TopbarComponent,
141-
SystemsComponent,
142-
MaterialsComponent,
143-
NotesComponent,
143+
ActionsComponent,
144144
PatternModal,
145145
InitModal,
146146
AboutModal,
147147
MaterialModal,
148-
DraftviewerComponent],
148+
LoomModal,
149+
DraftviewerComponent,
150+
SelectionComponent,
151+
SidebarComponent,
152+
WeaverViewComponent],
149153

150154
entryComponents: [
151155
InitModal,
152156
AboutModal,
153157
PatternModal,
154-
MaterialModal
158+
MaterialModal,
159+
LoomModal,
160+
DraftviewerComponent,
161+
ActionsComponent,
162+
WeaverViewComponent
155163
],
156164
})
157165
export class CoreModule { }

‎src/app/core/draftviewer/draftviewer.component.html‎

Lines changed: 108 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,129 @@
1-
<div class="draft-container" id="draft-container" width="500" height="500"
2-
>
1+
<div class="draft-container {{source}}" id="draft-container">
2+
3+
4+
5+
<div id = 'draft-scale-container'>
6+
7+
<app-selection
8+
#selection
9+
[render]="render"
10+
[loom]="loom"
11+
(onFill)="onFill($event)"
12+
(onCopy)="onCopy($event)"
13+
(onClear)="onClear($event)"
14+
(onPaste)="onPaste($event)"
15+
(onSelectionEnd)="onSelectionEnd($event)"
16+
></app-selection>
17+
18+
19+
<div class="warp-systems-container">
20+
<div class="warp-systems-text" id="warp-systems-text">
21+
<div class="warp-system-col"
22+
*ngFor="let i of (weave?.colShuttleMapping); let j = index;" >
23+
24+
<span *ngIf="(j % render?.getTextInterval() == 0 && (j+1 !== weave?.warps))" class="warp_number">{{j}}</span>
25+
<span *ngIf="(j+1 === weave?.warps)" class="warp_number_last">{{j+1}}</span>
26+
27+
<div class="warp_selectors">
28+
<span class="warp_delete" (click)="deleteCol(j);"><i class="fa fa-trash"></i>
29+
</span>
30+
31+
<span class="warp_clone"
32+
(click)="cloneCol(j,weave?.colToShuttle(j), weave?.colToSystem(j));">
33+
<i class="fa fa-clone"></i>
34+
</span>
35+
36+
37+
<span class="warp_insert"
38+
(click)="insertCol(j + 1, weave?.colToShuttle(j),weave?.colToSystem(j));">
39+
<i class="fa fa-plus-circle"></i></span>
40+
</div>
41+
42+
</div>
43+
44+
<!-- <div class="warp-system-col" >
45+
<span class="last-warp">{{draft?.warps}}</span>
46+
</div> -->
47+
48+
</div>
49+
50+
<canvas id="warp-systems" #warp_systems> </canvas>
51+
<canvas id="warp-materials" #warp_materials> </canvas>
52+
</div>
53+
54+
<div [class.hidden]="!render?.view_frames" class="threading-tieup-container">
55+
<canvas id="threading"></canvas>
56+
<canvas id="tieups" #tieups ></canvas>
57+
</div>
58+
59+
<div class="drawdown-container">
60+
<canvas id="drawdown" #drawDown > </canvas>
61+
<canvas [class.hidden]="!render?.view_frames" id="treadling" #treadling></canvas>
62+
63+
<div class="weft-systems-container">
64+
<canvas id="weft-materials" #weft_materials> </canvas>
65+
<canvas id="weft-systems" #weft_systems> </canvas>
66+
<div class="weft-systems-text" id="weft-systems-text">
67+
<div class="weft-system-row" *ngFor="let i of (render?.visibleRows); let j = index;" >
68+
69+
70+
<div class="weft_indicies">
71+
<span *ngIf="(i % render?.getTextInterval() == 0 && (j+1 !== weave?.wefts))" class="weft_number">{{j}}</span>
72+
<span *ngIf="(i+1 === weave?.wefts)" class="weft_number_last">{{i+1}}</span>
73+
</div>
74+
<span class = "weft_insert"
75+
(click)="insertRow(j, i)">
76+
<i class="fa fa-plus-circle"></i>
77+
</span>
78+
79+
<span class = "weft_clone"
80+
(click)="cloneRow(j, i);">
81+
<i class="fa fa-clone"></i>
82+
</span>
83+
84+
<span class="weft_delete"
85+
(click)="deleteRow(i);">
86+
<i class="fa fa-trash"></i>
87+
</span>
88+
</div>
89+
</div>
90+
</div>
91+
</div>
92+
93+
94+
95+
96+
97+
98+
99+
100+
101+
102+
</div>
103+
3104

4-
<canvas id="weft-systems" #weft_systems> </canvas>
5-
<canvas id="weft-materials" #weft_materials> </canvas>
6-
7-
<canvas id="warp-systems" #warp_systems> </canvas>
8-
<canvas id="warp-materials" #warp_materials> </canvas>
9-
10-
<canvas id="threading"></canvas>
11-
<canvas id="tieups" #tieups ></canvas>
12-
<canvas id="drawdown" #drawDown > </canvas>
13-
<canvas id="treadling" #treadling></canvas>
14-
15-
16-
<svg #mySelection class="selection" id="selection">
17-
<text x="5" y="5" text-anchor="start"></text>
18-
</svg>
19-
20105

21106

22107

23108
<div id = 'view_frames' [class.hidden]="loom?.type !== 'frame'" matTooltip="Show/Hide Threading, Tie-Up, and Treadling" class="view_frames"
24109
(click)="toggleViewFrames();">
25110

26-
<span><i class="fas" [class.fa-eye-slash]="!render?.view_frames" [class.fa-eye]="render?.view_frames">
27-
</i></span>
111+
<!-- <span><i class="fas" [class.fa-eye-slash]="!render?.view_frames" [class.fa-eye]="render?.view_frames">
112+
</i></span> -->
28113

29114
</div>
30115

31116

32-
<div class="weft-systems-text" id="weft-systems-text">
33-
<div class="weft-system-row" *ngFor="let i of (render?.visibleRows); let j = index;" >
34-
35-
36-
<span class="weft_number"
37-
[style.visibility]="(i % render?.getTextInterval() == 0) ? 'visible' : 'hidden'" >
38-
{{i}}
39-
</span>
40-
41-
<span class = "weft_insert"
42-
(click)="insertRow(j, i)">
43-
<i class="fa fa-plus-circle"></i>
44-
</span>
45-
46-
<span class = "weft_clone"
47-
(click)="cloneRow(j, i);">
48-
<i class="fa fa-clone"></i>
49-
</span>
50-
51-
<span class="weft_delete"
52-
(click)="deleteRow(i);">
53-
<i class="fa fa-trash"></i>
54-
</span>
55-
</div>
56-
</div>
57-
58-
59-
60-
61-
<div class="warp-systems-text" id="warp-systems-text">
62-
<div class="warp-system-col"
63-
*ngFor="let i of (weave?.colShuttleMapping); let j = index;" >
64-
65-
<span class="warp_delete" (click)="deleteCol(j);"><i class="fa fa-trash"></i>
66-
</span>
67-
68-
<span class="warp_clone"
69-
(click)="cloneCol(j,weave?.colToShuttle(j), weave?.colToSystem(j));">
70-
<i class="fa fa-clone"></i>
71-
</span>
72-
73-
74-
<span class="warp_insert"
75-
(click)="insertCol(j + 1, weave?.colToShuttle(j),weave?.colToSystem(j));">
76-
<i class="fa fa-plus-circle"></i></span>
77-
78-
<span class="warp_number"
79-
[style.visibility]="(j % render?.getTextInterval() == 0) ? 'visible' : 'hidden'">{{j}}</span>
80-
81-
82-
</div>
83-
</div>
84-
117+
85118

86119

87120

88-
<svg #activeRow class="active_row">
121+
<!-- <svg #activeRow class="active_row">
89122
</svg>
90123
91124
<svg #activeCol class="active_col">
92125
</svg>
93-
126+
-->
94127

95128

96129
<canvas #bitmapImage hidden></canvas>

0 commit comments

Comments
 (0)