質問編集履歴
1
教えてもらった方法でpullする前の差分を明示しました
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -15,3 +15,103 @@
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
よろしくお願いします
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
```terminal
|
|
22
|
+
|
|
23
|
+
Apple-no-MacBook:NotCloud apple$ cd Canvas/
|
|
24
|
+
|
|
25
|
+
Apple-no-MacBook:Canvas apple$ git status
|
|
26
|
+
|
|
27
|
+
On branch master
|
|
28
|
+
|
|
29
|
+
Your branch is up to date with 'origin/master'.
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
nothing to commit, working tree clean
|
|
34
|
+
|
|
35
|
+
Apple-no-MacBook:Canvas apple$ git diff
|
|
36
|
+
|
|
37
|
+
Apple-no-MacBook:Canvas apple$ git fetch
|
|
38
|
+
|
|
39
|
+
remote: Enumerating objects: 10, done.
|
|
40
|
+
|
|
41
|
+
remote: Counting objects: 100% (10/10), done.
|
|
42
|
+
|
|
43
|
+
remote: Compressing objects: 100% (4/4), done.
|
|
44
|
+
|
|
45
|
+
remote: Total 7 (delta 5), reused 5 (delta 3), pack-reused 0
|
|
46
|
+
|
|
47
|
+
Unpacking objects: 100% (7/7), done.
|
|
48
|
+
|
|
49
|
+
From https://github.com/KaedeAPK/Canvas
|
|
50
|
+
|
|
51
|
+
4b936f1..cfd3cb3 master -> origin/master
|
|
52
|
+
|
|
53
|
+
Apple-no-MacBook:Canvas apple$ git diff origin master
|
|
54
|
+
|
|
55
|
+
diff --git a/_gridLine05.html b/_gridLine05.html
|
|
56
|
+
|
|
57
|
+
index 5b1cbdb..e3a7539 100644
|
|
58
|
+
|
|
59
|
+
--- a/_gridLine05.html
|
|
60
|
+
|
|
61
|
+
+++ b/_gridLine05.html
|
|
62
|
+
|
|
63
|
+
@@ -13,8 +13,10 @@
|
|
64
|
+
|
|
65
|
+
<body>
|
|
66
|
+
|
|
67
|
+
<canvas></canvas>
|
|
68
|
+
|
|
69
|
+
<script>
|
|
70
|
+
|
|
71
|
+
- // updated 12-06
|
|
72
|
+
|
|
73
|
+
- // from (0,0)
|
|
74
|
+
|
|
75
|
+
+ // Up dated 11/02
|
|
76
|
+
|
|
77
|
+
+ // Background: glay by CSS
|
|
78
|
+
|
|
79
|
+
+ // This is Canvas Grid Line for drawing
|
|
80
|
+
|
|
81
|
+
+
|
|
82
|
+
|
|
83
|
+
// Lightgreen by every 500px line
|
|
84
|
+
|
|
85
|
+
// white line by 100px line
|
|
86
|
+
|
|
87
|
+
// glay by 50px.
|
|
88
|
+
|
|
89
|
+
@@ -25,35 +27,44 @@
|
|
90
|
+
|
|
91
|
+
var c = canvas.getContext('2d');
|
|
92
|
+
|
|
93
|
+
var midX = endX/2;
|
|
94
|
+
|
|
95
|
+
var midY = endY/2;
|
|
96
|
+
|
|
97
|
+
-
|
|
98
|
+
|
|
99
|
+
+
|
|
100
|
+
|
|
101
|
+
function gridLine() {
|
|
102
|
+
|
|
103
|
+
c.lineWidth = 1;
|
|
104
|
+
|
|
105
|
+
function strokeGrid() {
|
|
106
|
+
|
|
107
|
+
c.beginPath();
|
|
108
|
+
|
|
109
|
+
c.moveTo(i*50, 0);
|
|
110
|
+
|
|
111
|
+
- c.lineTo(i*50, endY);
|
|
112
|
+
|
|
113
|
+
:
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
```
|