[#77] Data mining (Part 8: Button to list sectors to mine)

tomas-nestorovic · Jun 3, 2024 · cb3bcbe · cb3bcbe
1 parent 05d5b5b
commit cb3bcbe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/Main/res/resource.rc b/Main/res/resource.rc
@@ -1990,10 +1990,11 @@ BEGIN
     DEFPUSHBUTTON   "Start",IDOK,303,209,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,356,209,50,14
     LTEXT           "Mining target:",IDC_STATIC,7,9,44,8,NOT WS_GROUP
-    COMBOBOX        ID_ACCURACY,63,7,343,166,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        ID_ACCURACY,63,7,324,166,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
+    PUSHBUTTON      "",ID_SECTOR,390,7,16,13
     LTEXT           "Approach:",IDC_STATIC,7,25,34,8,NOT WS_GROUP
-    COMBOBOX        ID_CREATOR,63,23,343,143,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        ID_CREATOR,63,23,324,143,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
     LTEXT           "Static",ID_CHART,7,48,399,149,NOT WS_VISIBLE | 
                     WS_BORDER | NOT WS_GROUP

diff --git a/Main/src/CapsBase_Mining.cpp b/Main/src/CapsBase_Mining.cpp
@@ -97,6 +97,7 @@
 				cbx.Detach();
 				if (const auto savedValue=app.GetProfileInt( INI_MINING, INI_TARGET, TARGET_NONE ))
 					SelectDlgComboBoxValue( ID_ACCURACY, savedValue, false );
+				SetDlgItemSingleCharUsingFont( ID_SECTOR, 0xf09d, FONT_WEBDINGS, 120 );
 				// . populating the "Mining approach" combo-box
 				cbx.Attach( GetDlgItemHwnd(ID_CREATOR) );
 					if (cb.properties->IsRealDevice())
@@ -232,6 +233,17 @@
 							// a significant error
 							Utils::FatalError( _T("Can't continue mining"), lParam );
 						return TRUE;
+					case ID_SECTOR:{
+						// message about the MiningTarget
+						miningTarget=(TMiningTarget)GetDlgComboBoxSelectedValue(ID_ACCURACY);
+						CString msg=_T("Target sectors:\n\n");
+						if (miningTarget&TARGET_ALL_STD_SECTORS_PRESENT)
+							msg+=cb.dos->ListStdSectors( cyl, head );
+						else if (miningTarget&TARGET_ALL_CURRENT_SECTORS_PRESENT)
+							msg+=cb.ListSectors( cyl, head );
+						Utils::Information(msg);
+						return TRUE;
+					}
 				}
 				return __super::OnCommand(wParam,lParam);
 			}

diff --git a/Main/src/Dos.cpp b/Main/src/Dos.cpp
@@ -140,6 +140,12 @@ reportError:Utils::Information(buf);
 		return formatBoot.nSectors;
 	}
 
+	CString CDos::ListStdSectors(TCylinder cyl,THead head) const{
+		// creates and returns a List of standard DOS Sector IDs
+		TSectorId ids[(TSector)-1];
+		return TSectorId::List( ids, GetListOfStdSectors(cyl,head,ids) );
+	}
+
 	TStdWinError CDos::IsTrackEmpty(TCylinder cyl,THead head,TSector nSectors,PCSectorId sectors) const{
 		// returns ERROR_EMPTY/ERROR_NOT_EMPTY or another Windows standard i/o error
 		TSectorStatus statuses[(TSector)-1],*ps=statuses;

diff --git a/Main/src/Dos.h b/Main/src/Dos.h
@@ -442,6 +442,7 @@
 		// other
 		bool IsKnown() const;
 		TSector GetListOfStdSectors(TCylinder cyl,THead head,PSectorId bufferId) const;
+		CString ListStdSectors(TCylinder cyl,THead head) const;
 		virtual TStdWinError CreateUserInterface(HWND hTdi);
 		virtual enum TCmdResult:BYTE{
 					REFUSED	=0,	// not carried out (e.g. because cannot)