Mercurial > hg > Papers > 2014 > nobuyasu-master

diff slides/graffle/merge_impl1.graffle @ 79:2e53de70f64e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed slide
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Mon, 03 Feb 2014 10:38:28 +0900
parents bd73f0e1cdd4
children
line wrap: on
line diff
--- a/slides/graffle/merge_impl1.graffle	Mon Feb 03 09:43:16 2014 +0900
+++ b/slides/graffle/merge_impl1.graffle	Mon Feb 03 10:38:28 2014 +0900
@@ -53,6 +53,132 @@
 	<array>
 		<dict>
 			<key>Bounds</key>
+			<string>{{186, 220}, {69, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>129</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1265
+\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 2A\'82\'f0\'92\'c7\'89\'c1}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>128</integer>
+			<key>Points</key>
+			<array>
+				<string>{248, 248}</string>
+				<string>{193, 248}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>FilledArrow</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>127</integer>
+			<key>Points</key>
+			<array>
+				<string>{358, 248.69137573242188}</string>
+				<string>{303, 248.69137573242188}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{297, 220}, {69, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>126</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1265
+\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 2B\'82\'f0\'92\'c7\'89\'c1}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
 			<string>{{38.2528076171875, 239}, {69, 36}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
@@ -141,8 +267,8 @@
 			<integer>122</integer>
 			<key>Points</key>
 			<array>
-				<string>{450, 260.04291712116543}</string>
-				<string>{426.49924119410218, 258.7097886371468}</string>
+				<string>{450, 260.05541113276905}</string>
+				<string>{426.49922249609187, 258.73079228333796}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -176,8 +302,8 @@
 			<integer>121</integer>
 			<key>Points</key>
 			<array>
-				<string>{107.2528076171875, 256.99997839274545}</string>
-				<string>{125.46880340576172, 256.99996698411769}</string>
+				<string>{107.2528076171875, 256.99998639009777}</string>
+				<string>{125.46880340576172, 256.99998639009777}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -211,8 +337,8 @@
 			<integer>120</integer>
 			<key>Points</key>
 			<array>
-				<string>{402.02946723861231, 329.15684189793234}</string>
-				<string>{410.64639842655112, 354.60612798829442}</string>
+				<string>{402.02941558804184, 329.15686304943409}</string>
+				<string>{410.64627854496194, 354.60617670803515}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -246,8 +372,8 @@
 			<integer>119</integer>
 			<key>Points</key>
 			<array>
-				<string>{161.52946362279454, 329.1568422179347}</string>
-				<string>{170.14639345951389, 354.60612762643075}</string>
+				<string>{161.52941197221759, 329.15686336943639}</string>
+				<string>{170.14627357791323, 354.60617634617159}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -434,8 +560,8 @@
 			<integer>113</integer>
 			<key>Points</key>
 			<array>
-				<string>{387.62236973629228, 328.54183262904701}</string>
-				<string>{375.97896183908267, 356.16803336448282}</string>
+				<string>{387.62253883761252, 328.54191891490035}</string>
+				<string>{375.97938100993071, 356.16824724912578}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -469,8 +595,8 @@
 			<integer>112</integer>
 			<key>Points</key>
 			<array>
-				<string>{380.66432492551081, 322.41374128893654}</string>
-				<string>{333.54337904264867, 362.29645895690038}</string>
+				<string>{380.66432871618662, 322.4137467226123}</string>
+				<string>{333.54339492351937, 362.29648161406601}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -722,8 +848,8 @@
 			<integer>102</integer>
 			<key>Points</key>
 			<array>
-				<string>{147.12236686160171, 328.54183262904706}</string>
-				<string>{135.47895896439221, 356.16803336448288}</string>
+				<string>{147.12253596292197, 328.54191891490041}</string>
+				<string>{135.47937813524018, 356.16824724912584}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -757,8 +883,8 @@
 			<integer>101</integer>
 			<key>Points</key>
 			<array>
-				<string>{140.16432205082012, 322.41374128893665}</string>
-				<string>{93.043376167957874, 362.29645895690038}</string>
+				<string>{140.16432584149609, 322.41374672261225}</string>
+				<string>{93.043392048828608, 362.29648161406601}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -973,7 +1099,7 @@
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2014-02-02 18:16:57 +0000</string>
+	<string>2014-02-03 00:45:17 +0000</string>
 	<key>Modifier</key>
 	<string>Oshiro Nobuyasu</string>
 	<key>NotesVisible</key>