Commit: bf0263cc404687c124f26bb234f12483fbe4c2df - L3DiskEx (git)

L3 Disk Explorer is an application in order to access to files in a floppy disk image for retro computer and operating system.

Commit MetaInfo

• Revision: bf0263cc404687c124f26bb234f12483fbe4c2df (tree)
• Time: 2022-04-21 21:08:46
• Author: Sasaji <sasaji@s-sa...>
• Commiter: Sasaji

Log Message

Version 0.4.5 Release

Change Summary

• modified: Makefile.macosx
• modified: data/disk_types.xml
• modified: docs/ChangeLog.txt
• modified: docs/DiskBasicSpec.txt
• modified: docs/Readme.txt
• modified: readme.txt
• modified: src/diskparambox.cpp
• modified: src/diskparambox.h
• modified: src/res/Info.plist
• modified: src/uidisklist.cpp
• modified: src/version.h

Incremental Difference

--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -3,7 +3,7 @@
 #
 CC=g++
 
-APPLICATION_VERSION=0.4.4
+APPLICATION_VERSION=0.4.5
 
 CDEFS=
 DBG_CDEFS=-D_DEBUG -D_DEBUG_LOG

--- a/data/disk_types.xml
+++ b/data/disk_types.xml
@@ -1061,6 +1061,7 @@
 			<Type>L3S1-2HD</Type>
 			<Type p="major">X1HU-2HD</Type>
 			<Type p="major">X1HU-2HD-2D</Type>
+			<Type>OS9-2HD</Type>
 		</DiskBasicTypes>
 		<DensityName>2HD/8inch2D</DensityName>
 		<DensityName lang="ja">2HD/8インチ2D</DensityName>
@@ -1092,6 +1093,7 @@
 		<Interleave>2</Interleave>
 		<DiskBasicTypes>
 			<Type>N88-2HD</Type>
+			<Type>OS9-2HD</Type>
 		</DiskBasicTypes>
 		<DensityName>2HD/8inch2D</DensityName>
 		<DensityName lang="ja">2HD/8インチ2D</DensityName>

--- a/docs/ChangeLog.txt
+++ b/docs/ChangeLog.txt
@@ -2,6 +2,14 @@
  更新履歴
 ==============================================================================
 
[phone]	Version 0.4.5
+・ディスクリスト内のメニューにある「ディスク情報」のダイアログでOKを押すと
+  異常終了する不具合を修正した。
+・ディスクリスト内のメニューにある「ディスク情報」で密度が正しく設定されて
+  いない不具合を修正した。
+・ディスク新規作成でパラメータを手動設定にした場合、密度を2DDや2HDに選択しても
+  それが作成後のディスクに反映されない不具合を修正した。
+
 2019-12-14	Version 0.4.4
 ・FM用2HDディスクの新規作成でトラック0、サイド0を単密度で作成するように
   パラメータを変更した。

--- a/docs/DiskBasicSpec.txt
+++ b/docs/DiskBasicSpec.txt
@@ -1,8 +1,8 @@
 ==============================================================================
     L3 Disk Explorer 仕様
-                                                              Version 0.4.4
+                                                              Version 0.4.5
 
-                            Copyright(C) Sasaji 2015-2019 All Rights Reserved.
+                            Copyright(C) Sasaji 2015-2020 All Rights Reserved.
 ==============================================================================
 
 ●現在対応しているファイルシステム

--- a/docs/Readme.txt
+++ b/docs/Readme.txt
@@ -1,9 +1,9 @@
 ==============================================================================
     L3 Disk Explorer
-                                                              Version 0.4.4
-                                                                2019/12/14
+                                                              Version 0.4.5
+                                                                2020/02/11
 
-                            Copyright(C) Sasaji 2015-2019 All Rights Reserved.
+                            Copyright(C) Sasaji 2015-2020 All Rights Reserved.
 ==============================================================================
 
 ● はじめに
@@ -1052,7 +1052,7 @@
 ・CP/M Operating System Manual - DIGITAL RESERCH
 ・THE PROGRAMMER'S CP/M HANDBOOK - Osborne/McGraw-Hill
 ・Retro PC Gallery
-  (http://www.mindspring.com/~thasegaw/rpcg/index.html)
+  (http://haserin09.la.coocan.jp/index.html)
 ・アルゴの記憶
   (http://www.geocities.co.jp/SiliconValley-Sunnyvale/2521/)
 ・T.Fukui's Classic PC Web

--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 ==============================================================================
     L3 Disk Explorer
 
-                            Copyright(C) Sasaji 2015-2019 All Rights Reserved.
+                            Copyright(C) Sasaji 2015-2020 All Rights Reserved.
 ==============================================================================
 
 ファイル構成

--- a/src/diskparambox.cpp
+++ b/src/diskparambox.cpp
@@ -285,18 +285,22 @@ bool DiskParamBox::ValidateAllParam()
 	int sec = GetSectorsPerTrack();
 	int inl = GetInterleave();
 	if (disk_params) {
-		int i = comTemplate->GetSelection();
-		if (i < ((int)disk_params->Count() - 1)) {
-			if (disk_params->Item(i) == NULL) {
-				return false;
+		if (comTemplate) {
+			int i = comTemplate->GetSelection();
+			if (i < ((int)disk_params->Count() - 1)) {
+				if (disk_params->Item(i) == NULL) {
+					return false;
+				}
 			}
 		}
 	} else {
-		int i = comTemplate->GetSelection();
-		int temp_pos = -1;
-		if (i >= 0) temp_pos = (int)(intptr_t)comTemplate->GetClientData((wxUint32)i);
-		if (temp_pos < 0) {
-			return false;
+		if (comTemplate) {
+			int i = comTemplate->GetSelection();
+			int temp_pos = -1;
+			if (i >= 0) temp_pos = (int)(intptr_t)comTemplate->GetClientData((wxUint32)i);
+			if (temp_pos < 0) {
+				return false;
+			}
 		}
 	}
 	if (trk * sid > DISKD88_MAX_TRACKS) {
@@ -488,7 +492,7 @@ void DiskParamBox::SetParamFromDisk(const DiskD88Disk *disk)
 	SetParamToControl(disk);
 	if (txtDiskName) txtDiskName->SetValue(disk->GetName(true));
 	if (chkWprotect) chkWprotect->SetValue(disk->IsWriteProtected());
-	if (comDensity) comDensity->SetSelection(disk->GetDensity());
+	if (comDensity) comDensity->SetSelection(disk->FindDensity(disk->GetDensity()));
 
 	txtTracks->Enable(false);
 	txtSides->Enable(false);
@@ -642,7 +646,7 @@ void DiskParamBox::GetParamForManual(DiskParam &param)
 		GetSectorsPerTrack(),
 		GetSectorSize(),
 		GetNumberingSector(),
-		GetDensity(),
+		GetDensityValue(),
 		GetInterleave(),
 		sd,
 		pt,
@@ -726,13 +730,20 @@ wxString DiskParamBox::GetDiskName() const
 	return txtDiskName ? txtDiskName->GetValue() : wxT("");
 }
 
-/// 密度を返す
+/// 密度（セレクトボックスの位置）を返す
 /// @return 0:2D 1:2DD 2:2HD
 int DiskParamBox::GetDensity() const
 {
 	return comDensity ? comDensity->GetSelection() : 0;
 }
 
+/// 密度を表す値を返す
+/// @return 0x00:2D 0x10:2DD 0x20:2HD
+wxUint8 DiskParamBox::GetDensityValue() const
+{
+	return gDiskDensity[GetDensity()].val;
+}
+
 /// ディスク書き込み禁止か
 bool DiskParamBox::IsWriteProtected() const
 {

--- a/src/diskparambox.h
+++ b/src/diskparambox.h
@@ -128,6 +128,7 @@ public:
 	int GetNumberingSector() const;
 	wxString GetDiskName() const;
 	int GetDensity() const;
+	wxUint8 GetDensityValue() const;
 	bool IsWriteProtected() const;
 	int  GetSingleNumber() const;
 	int  GetSingleSectorsPerTrack() const;

--- a/src/res/Info.plist
+++ b/src/res/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>l3diskex</string>
 	<key>CFBundleGetInfoString</key>
-	<string>L3DiskExplorer version APPLICATION_VERSION, (c) 2015-2019 Sasaji</string>
+	<string>L3DiskExplorer version APPLICATION_VERSION, (c) 2015-2020 Sasaji</string>
 	<key>CFBundleIconFile</key>
 	<string>l3diskex.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
 		<string>jp</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>APPLICATION_VERSION, (c) 2015-2019 Sasaji</string>
+	<string>APPLICATION_VERSION, (c) 2015-2020 Sasaji</string>
 	<key>CFBundleName</key>
 	<string>L3DiskExproler</string>
 	<key>CFBundlePackageType</key>
@@ -37,6 +37,6 @@
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2015-2019 Sasaji</string>
+	<string>Copyright 2015-2020 Sasaji</string>
 </dict>
 </plist>

--- a/src/uidisklist.cpp
+++ b/src/uidisklist.cpp
@@ -1081,7 +1081,7 @@ bool L3DiskList::InitializeDisk()
 				DiskParam param;
 				dlg.GetParam(param);
 				selected_disk->SetName(dlg.GetDiskName());
-				selected_disk->SetDensity(dlg.GetDensity());
+				selected_disk->SetDensity(dlg.GetDensityValue());
 				selected_disk->SetWriteProtect(dlg.IsWriteProtected());
 				selected_disk->GetFile()->SetBasicTypeHint(dlg.GetCategory());
 				sts = selected_disk->Rebuild(param, selected_side);
@@ -1232,7 +1232,7 @@ void L3DiskList::ShowDiskAttr()
 		DiskParam param;
 		dlg.GetParam(param);
 		selected_disk->SetName(dlg.GetDiskName());
-		selected_disk->SetDensity(dlg.GetDensity());
+		selected_disk->SetDensity(dlg.GetDensityValue());
 		selected_disk->SetWriteProtect(dlg.IsWriteProtected());
 		selected_disk->SetModify();
 		// ディスク名をセット

--- a/src/version.h
+++ b/src/version.h
@@ -1,17 +1,17 @@
 /// @file version.h
 ///
-/// @author Copyright (c) 2015-2019 Sasaji. All rights reserved.
+/// @author Copyright (c) 2015-2020 Sasaji. All rights reserved.
 ///
 
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define APPLICATION_VERSION	"0.4.4"
+#define APPLICATION_VERSION	"0.4.5"
 #define APP_VER_MAJOR	0
 #define APP_VER_MINOR	4
-#define APP_VER_REV	4
+#define APP_VER_REV	5
 #define APP_VER_BUILD	0
-#define APP_COPYRIGHT	"Copyright (C) 2015-2019 Sasaji"
+#define APP_COPYRIGHT	"Copyright (C) 2015-2020 Sasaji"
 
 #if defined(__MINGW32__)
 #if defined(x86_64) || defined(__x86_64)