Mercurial > hg > Papers > 2014 > nobuyasu-master

comparison paper/graffle/merge_imp2.graffle @ 23:21e1a110f258

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Writed description of merge
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Thu, 23 Jan 2014 21:15:10 +0900
parents 56753cfbeeab
children
comparison
equal deleted inserted replaced
22:56753cfbeeab 23:21e1a110f258
50 <key>GraphDocumentVersion</key> 50 <key>GraphDocumentVersion</key>
51 <integer>8</integer> 51 <integer>8</integer>
52 <key>GraphicsList</key> 52 <key>GraphicsList</key>
53 <array> 53 <array>
54 <dict> 54 <dict>
55 <key>Class</key>
56 <string>LineGraphic</string>
57 <key>Head</key>
58 <dict>
59 <key>ID</key>
60 <integer>148</integer>
61 </dict>
62 <key>ID</key>
63 <integer>161</integer>
64 <key>Points</key>
65 <array>
66 <string>{226.090720582458, 356.66981518574812}</string>
67 <string>{328, 394}</string>
68 <string>{403.70772195802908, 389}</string>
69 <string>{432.57692128038974, 363.40302036185045}</string>
70 </array>
71 <key>Style</key>
72 <dict>
73 <key>stroke</key>
74 <dict>
75 <key>HeadArrow</key>
76 <string>FilledArrow</string>
77 <key>Legacy</key>
78 <true/>
79 <key>LineType</key>
80 <integer>1</integer>
81 <key>Pattern</key>
82 <integer>1</integer>
83 <key>TailArrow</key>
84 <string>FilledArrow</string>
85 </dict>
86 </dict>
87 <key>Tail</key>
88 <dict>
89 <key>ID</key>
90 <integer>147</integer>
91 </dict>
92 </dict>
93 <dict>
94 <key>Class</key>
95 <string>LineGraphic</string>
96 <key>Head</key>
97 <dict>
98 <key>ID</key>
99 <integer>139</integer>
100 </dict>
101 <key>ID</key>
102 <integer>160</integer>
103 <key>Points</key>
104 <array>
105 <string>{175.30887809225194, 360.15468367970215}</string>
106 <string>{232, 394}</string>
107 <string>{346, 386}</string>
108 <string>{381.81664540479352, 361.31837136969887}</string>
109 </array>
110 <key>Style</key>
111 <dict>
112 <key>stroke</key>
113 <dict>
114 <key>HeadArrow</key>
115 <string>FilledArrow</string>
116 <key>Legacy</key>
117 <true/>
118 <key>LineType</key>
119 <integer>1</integer>
120 <key>Pattern</key>
121 <integer>1</integer>
122 <key>TailArrow</key>
123 <string>FilledArrow</string>
124 </dict>
125 </dict>
126 <key>Tail</key>
127 <dict>
128 <key>ID</key>
129 <integer>133</integer>
130 </dict>
131 </dict>
132 <dict>
133 <key>Bounds</key>
134 <string>{{204.2458553314209, 254}, {104, 45.320404052734375}}</string>
135 <key>Class</key>
136 <string>ShapedGraphic</string>
137 <key>ID</key>
138 <integer>151</integer>
139 <key>Shape</key>
140 <string>Rectangle</string>
141 <key>Style</key>
142 <dict>
143 <key>fill</key>
144 <dict>
145 <key>Draws</key>
146 <string>NO</string>
147 </dict>
148 <key>shadow</key>
149 <dict>
150 <key>Draws</key>
151 <string>NO</string>
152 </dict>
153 <key>stroke</key>
154 <dict>
155 <key>Draws</key>
156 <string>NO</string>
157 </dict>
158 </dict>
159 <key>Text</key>
160 <dict>
161 <key>Text</key>
162 <string>{\rtf1\ansi\ansicpg1252\cocoartf1265
163 \cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
164 {\colortbl;\red255\green255\blue255;}
165 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
166
167 \f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'82\'cc\'90\'ae\'8d\'87\'90\'ab\'82\'aa\'95\'f6\'82\'ea\'82\'e9}</string>
168 </dict>
169 </dict>
170 <dict>
171 <key>Class</key>
172 <string>LineGraphic</string>
173 <key>Head</key>
174 <dict>
175 <key>ID</key>
176 <integer>148</integer>
177 </dict>
178 <key>ID</key>
179 <integer>150</integer>
180 <key>Points</key>
181 <array>
182 <string>{387.3087599956753, 255.66475457053909}</string>
183 <string>{436.5408049210252, 332.17611886793577}</string>
184 </array>
185 <key>Style</key>
186 <dict>
187 <key>stroke</key>
188 <dict>
189 <key>HeadArrow</key>
190 <string>FilledArrow</string>
191 <key>Legacy</key>
192 <true/>
193 <key>LineType</key>
194 <integer>1</integer>
195 <key>TailArrow</key>
196 <string>0</string>
197 </dict>
198 </dict>
199 <key>Tail</key>
200 <dict>
201 <key>ID</key>
202 <integer>134</integer>
203 </dict>
204 </dict>
205 <dict>
206 <key>Class</key>
207 <string>LineGraphic</string>
208 <key>Head</key>
209 <dict>
210 <key>ID</key>
211 <integer>147</integer>
212 </dict>
213 <key>ID</key>
214 <integer>149</integer>
215 <key>Points</key>
216 <array>
217 <string>{146.80875653627365, 255.66475500535185}</string>
218 <string>{196.04079697201334, 332.17611844257738}</string>
219 </array>
220 <key>Style</key>
221 <dict>
222 <key>stroke</key>
223 <dict>
224 <key>HeadArrow</key>
225 <string>FilledArrow</string>
226 <key>Legacy</key>
227 <true/>
228 <key>LineType</key>
229 <integer>1</integer>
230 <key>TailArrow</key>
231 <string>0</string>
232 </dict>
233 </dict>
234 <key>Tail</key>
235 <dict>
236 <key>ID</key>
237 <integer>125</integer>
238 </dict>
239 </dict>
240 <dict>
241 <key>Bounds</key> 55 <key>Bounds</key>
242 <string>{{429.68295955657959, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string> 56 <string>{{429.68295955657959, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string>
243 <key>Class</key> 57 <key>Class</key>
244 <string>ShapedGraphic</string> 58 <string>ShapedGraphic</string>
245 <key>ID</key> 59 <key>ID</key>
263 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc 77 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
264 78
265 \f0\fs24 \cf0 2A}</string> 79 \f0\fs24 \cf0 2A}</string>
266 <key>VerticalPad</key> 80 <key>VerticalPad</key>
267 <integer>0</integer> 81 <integer>0</integer>
82 </dict>
83 </dict>
84 <dict>
85 <key>Class</key>
86 <string>LineGraphic</string>
87 <key>Head</key>
88 <dict>
89 <key>ID</key>
90 <integer>148</integer>
91 </dict>
92 <key>ID</key>
93 <integer>161</integer>
94 <key>Points</key>
95 <array>
96 <string>{226.090720582458, 356.66981518574812}</string>
97 <string>{328, 394}</string>
98 <string>{403.70772195802908, 389}</string>
99 <string>{432.57692128038974, 363.40302036185045}</string>
100 </array>
101 <key>Style</key>
102 <dict>
103 <key>stroke</key>
104 <dict>
105 <key>HeadArrow</key>
106 <string>FilledArrow</string>
107 <key>Legacy</key>
108 <true/>
109 <key>LineType</key>
110 <integer>1</integer>
111 <key>Pattern</key>
112 <integer>1</integer>
113 <key>TailArrow</key>
114 <string>FilledArrow</string>
115 </dict>
116 </dict>
117 <key>Tail</key>
118 <dict>
119 <key>ID</key>
120 <integer>147</integer>
121 </dict>
122 </dict>
123 <dict>
124 <key>Class</key>
125 <string>LineGraphic</string>
126 <key>Head</key>
127 <dict>
128 <key>ID</key>
129 <integer>139</integer>
130 </dict>
131 <key>ID</key>
132 <integer>160</integer>
133 <key>Points</key>
134 <array>
135 <string>{175.30887809225194, 360.15468367970215}</string>
136 <string>{232, 394}</string>
137 <string>{346, 386}</string>
138 <string>{381.81664540479352, 361.31837136969887}</string>
139 </array>
140 <key>Style</key>
141 <dict>
142 <key>stroke</key>
143 <dict>
144 <key>HeadArrow</key>
145 <string>FilledArrow</string>
146 <key>Legacy</key>
147 <true/>
148 <key>LineType</key>
149 <integer>1</integer>
150 <key>Pattern</key>
151 <integer>1</integer>
152 <key>TailArrow</key>
153 <string>FilledArrow</string>
154 </dict>
155 </dict>
156 <key>Tail</key>
157 <dict>
158 <key>ID</key>
159 <integer>133</integer>
160 </dict>
161 </dict>
162 <dict>
163 <key>Bounds</key>
164 <string>{{204.2458553314209, 254}, {104, 45.320404052734375}}</string>
165 <key>Class</key>
166 <string>ShapedGraphic</string>
167 <key>ID</key>
168 <integer>151</integer>
169 <key>Shape</key>
170 <string>Rectangle</string>
171 <key>Style</key>
172 <dict>
173 <key>fill</key>
174 <dict>
175 <key>Draws</key>
176 <string>NO</string>
177 </dict>
178 <key>shadow</key>
179 <dict>
180 <key>Draws</key>
181 <string>NO</string>
182 </dict>
183 <key>stroke</key>
184 <dict>
185 <key>Draws</key>
186 <string>NO</string>
187 </dict>
188 </dict>
189 <key>Text</key>
190 <dict>
191 <key>Text</key>
192 <string>{\rtf1\ansi\ansicpg1252\cocoartf1265
193 \cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
194 {\colortbl;\red255\green255\blue255;}
195 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
196
197 \f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'82\'cc\'90\'ae\'8d\'87\'90\'ab\'82\'aa\'95\'f6\'82\'ea\'82\'e9}</string>
198 </dict>
199 </dict>
200 <dict>
201 <key>Class</key>
202 <string>LineGraphic</string>
203 <key>Head</key>
204 <dict>
205 <key>ID</key>
206 <integer>148</integer>
207 </dict>
208 <key>ID</key>
209 <integer>150</integer>
210 <key>Points</key>
211 <array>
212 <string>{387.3087599956753, 255.66475457053909}</string>
213 <string>{436.5408049210252, 332.17611886793577}</string>
214 </array>
215 <key>Style</key>
216 <dict>
217 <key>stroke</key>
218 <dict>
219 <key>HeadArrow</key>
220 <string>FilledArrow</string>
221 <key>Legacy</key>
222 <true/>
223 <key>LineType</key>
224 <integer>1</integer>
225 <key>TailArrow</key>
226 <string>0</string>
227 </dict>
228 </dict>
229 <key>Tail</key>
230 <dict>
231 <key>ID</key>
232 <integer>134</integer>
233 </dict>
234 </dict>
235 <dict>
236 <key>Class</key>
237 <string>LineGraphic</string>
238 <key>Head</key>
239 <dict>
240 <key>ID</key>
241 <integer>147</integer>
242 </dict>
243 <key>ID</key>
244 <integer>149</integer>
245 <key>Points</key>
246 <array>
247 <string>{146.80875653627365, 255.66475500535185}</string>
248 <string>{196.04079697201334, 332.17611844257738}</string>
249 </array>
250 <key>Style</key>
251 <dict>
252 <key>stroke</key>
253 <dict>
254 <key>HeadArrow</key>
255 <string>FilledArrow</string>
256 <key>Legacy</key>
257 <true/>
258 <key>LineType</key>
259 <integer>1</integer>
260 <key>TailArrow</key>
261 <string>0</string>
262 </dict>
263 </dict>
264 <key>Tail</key>
265 <dict>
266 <key>ID</key>
267 <integer>125</integer>
268 </dict> 268 </dict>
269 </dict> 269 </dict>
270 <dict> 270 <dict>
271 <key>Bounds</key> 271 <key>Bounds</key>
272 <string>{{189.18295097351074, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string> 272 <string>{{189.18295097351074, 329.73361206054688}, {36.423714896880369, 40.175481687463943}}</string>
888 <key>MagnetsVisible</key> 888 <key>MagnetsVisible</key>
889 <string>NO</string> 889 <string>NO</string>
890 <key>MasterSheets</key> 890 <key>MasterSheets</key>
891 <array/> 891 <array/>
892 <key>ModificationDate</key> 892 <key>ModificationDate</key>
893 <string>2014-01-23 10:03:51 +0000</string> 893 <string>2014-01-23 12:07:50 +0000</string>
894 <key>Modifier</key> 894 <key>Modifier</key>
895 <string>Oshiro Nobuyasu</string> 895 <string>Oshiro Nobuyasu</string>
896 <key>NotesVisible</key> 896 <key>NotesVisible</key>
897 <string>NO</string> 897 <string>NO</string>
898 <key>Orientation</key> 898 <key>Orientation</key>
969 <key>name</key> 969 <key>name</key>
970 <string>Canvas 1</string> 970 <string>Canvas 1</string>
971 </dict> 971 </dict>
972 </array> 972 </array>
973 <key>Frame</key> 973 <key>Frame</key>
974 <string>{{108, 36}, {693, 922}}</string> 974 <string>{{298, 36}, {693, 922}}</string>
975 <key>ListView</key> 975 <key>ListView</key>
976 <true/> 976 <true/>
977 <key>OutlineWidth</key> 977 <key>OutlineWidth</key>
978 <integer>142</integer> 978 <integer>142</integer>
979 <key>RightSidebar</key> 979 <key>RightSidebar</key>