[WASimUI] Add 'B' and 'R' variable types back to selector; Remove unused "Deprecated" column from docs reference view; Update docs import database as of Nov. 25 '24.

mpaperno · mpaperno · commit 36e925c43f38 · 2024-11-28T09:57:40.000-05:00
diff --git a/src/WASimUI/DocImports.h b/src/WASimUI/DocImports.h
@@ -141,7 +141,12 @@ class DocImportsModel : public QSqlTableModel
 			return;
 		}
 
-		int col = fieldIndex("Multiplayer");
+		removeColumnName("Multiplayer");
+		removeColumnName("Deprecated");
+	}
+
+	void removeColumnName(const QString &name) {
+		const int col = fieldIndex(name);
 		if (col > -1)
 			removeColumn(col);
 	}
diff --git a/src/WASimUI/Utils.h b/src/WASimUI/Utils.h
@@ -234,7 +234,7 @@ class Utils
 		}
 
 		static bool isSettableVariableType(const char type) {
-			static const std::vector<char> VAR_TYPES_SETTABLE = { 'A', 'C', 'H', 'K', 'L', 'Z' };
+			static const std::vector<char> VAR_TYPES_SETTABLE = { 'A', 'B', 'C', 'H', 'K', 'L', 'Z' };
 			return find(VAR_TYPES_SETTABLE.cbegin(), VAR_TYPES_SETTABLE.cend(), type) != VAR_TYPES_SETTABLE.cend();
 		}
 
diff --git a/src/WASimUI/resources/MSFS_SDK_Doc_Import.sqlite3 b/src/WASimUI/resources/MSFS_SDK_Doc_Import.sqlite3
diff --git a/src/WASimUI/widgets/Widgets.h b/src/WASimUI/widgets/Widgets.h
@@ -27,7 +27,7 @@ and is also available at <http://www.gnu.org/licenses/>.
 #include "client/WASimClient.h"
 #include "DataComboBox.h"
 #include "DeletableItemsComboBox.h"
-#include "Utils.h"
+#include "../Utils.h"
 
 namespace WASimUiNS
 {
@@ -269,7 +269,7 @@ class VariableTypeComboBox : public DataComboBox
 		setToolTip(tr("Named variable type. Types marked with a * use Unit specifiers. Most 'L' vars will ignore the Unit (default is 'number')."));
 
 		addItem(tr("A: SimVar *"), 'A');
-		//addItem(tr("B: Input"),    'B');  // only for gauge modules
+		addItem(tr("B: Input"),    'B');  // only for gauge modules in FS20
 		addItem(tr("C: GPS *"),    'C');
 		addItem(tr("E: Env. *"),   'E');
 		addItem(tr("H: HTML"),     'H');
@@ -278,7 +278,7 @@ class VariableTypeComboBox : public DataComboBox
 		addItem(tr("L: Local *"),  'L');
 		addItem(tr("M: Mouse"),    'M');
 		//addItem(tr("O: Comp."),    'O');  // only for gauge modules
-		//addItem(tr("R: Resource"), 'R');  // strings only, can't be read with "Get" command or set at all
+		addItem(tr("R: Resource"), 'R');
 		addItem(tr("T: Token"),    'T');
 		addItem(tr("Z: Custom"),   'Z');
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,12 @@ class DocImportsModel : public QSqlTableModel`
`141`	`141`	`return;`
`142`	`142`	`}`
`143`	`143`
`144`		`- int col = fieldIndex("Multiplayer");`
	`144`	`+ removeColumnName("Multiplayer");`
	`145`	`+ removeColumnName("Deprecated");`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ void removeColumnName(const QString &name) {`
	`149`	`+ const int col = fieldIndex(name);`
`145`	`150`	`if (col > -1)`
`146`	`151`	`removeColumn(col);`
`147`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ class Utils`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`static bool isSettableVariableType(const char type) {`
`237`		`- static const std::vector<char> VAR_TYPES_SETTABLE = { 'A', 'C', 'H', 'K', 'L', 'Z' };`
	`237`	`+ static const std::vector<char> VAR_TYPES_SETTABLE = { 'A', 'B', 'C', 'H', 'K', 'L', 'Z' };`
`238`	`238`	`return find(VAR_TYPES_SETTABLE.cbegin(), VAR_TYPES_SETTABLE.cend(), type) != VAR_TYPES_SETTABLE.cend();`
`239`	`239`	`}`
`240`	`240`