PenTabletNotebook 1.5

Author: manoreken2

DOPage.cs

@@ -15,6 +15,9 @@ public string ImgFilename {
             set { mImgFilename = value; }
         }
 
+        private string mSaveDir;
+        private string mLoadDir;
+
         /// <summary>
         /// DrawObjの情報をシリアライズし保持。
         /// </summary>
@@ -59,6 +62,9 @@ public bool Save(System.IO.BinaryWriter bw) {
         }
 
         public void Load(int fileVersion, System.IO.BinaryReader br, string saveDir, string loadDir) {
+            mSaveDir = saveDir;
+            mLoadDir = loadDir;
+
             // brから読んでメモリ上にバッファbを作成。
             int bytes = br.ReadInt32();
             var b = br.ReadBytes(bytes);
@@ -72,11 +78,6 @@ public void Load(int fileVersion, System.IO.BinaryReader br, string saveDir, str
             mBR = new System.IO.BinaryReader(mMStream);
             mBW.Seek(0, System.IO.SeekOrigin.Begin);
             Deserialize(fileVersion, null);
-
-            if (!saveDir.Equals(loadDir) && mImgFilename.StartsWith(saveDir)) {
-                // mImgFilenameがsaveDirを含む場合、loadDirに置き換えます。
-                mImgFilename = mImgFilename.Replace(saveDir, loadDir);
-            }
         }
 
 
@@ -155,6 +156,12 @@ public IEnumerable<DrawObj> Deserialize(int fileVersion, InkCanvas inkCanvas) {
 
                 // mImgFilename文字列を読み出します。
                 mImgFilename = SaveLoad.DeserializeString(mBR);
+                if (mImgFilename.StartsWith(mSaveDir)) {
+                    // mImgFilenameがsaveDirを含む場合、loadDirに置き換えます。
+                    mImgFilename = mImgFilename.Replace(mSaveDir, mLoadDir);
+
+                    Console.WriteLine("img {0}", mImgFilename);
+                }
 
                 int dCount = mBR.ReadInt32();
                 for (int i=0; i<dCount; ++i) {

Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]