Changes between Version 9 and Version 10 of Docs/825gen2/Dev/UpdatingLegacyAppsToNewLook

Timestamp:

02/08/24 12:48:55 (21 months ago)

Author:

Don Wilson

Comment:

--

Docs/825gen2/Dev/UpdatingLegacyAppsToNewLook

@@ -187 +187 @@
 
 {{{
-void IDScreen(void) 
+void PresetScreen(void)
 {
 #if ARM64
         CFormRect rect, rectInp;
 
-        FORM_INIT(ID, EventIDShow, NULL, NULL, NULL, nFormFlgShowHelp);
-
-        SetupInputFormToUseFontSet(formID, rect, rectInp, LANG(STR_ID_PROMPT));
-
-        FORM_ADD_INPUT2(ID, ID, rect,   rectInp, LANG(STR_ID_PROMPT) , 10, 0, 0, NULL, id, 0, NULL, LANG(STR_ID_HELP));
-#else
-        FORM_INIT(ID, EventIDShow, NULL, NULL, NULL, nFormFlgShowHelp);
-        FORM_ADD_INPUT(ID, ID, INPUT_ID_X, INPUT_ID_Y, LANG(STR_ID_PROMPT) , 10, 0, 0, NULL, id, 0, NULL, LANG(STR_ID_HELP));
-#endif
-        FORM_SHOW(ID);
-        FORM_RUN(ID);
-        FORM_HIDE(ID);
-}
-
+        FORM_INIT(Setup, EventPresetScreenShow, NULL, NULL, NULL, nFormFlgShowHelp);
+
+        SetupInputFormToUseFontSet(formSetup, rect, rectInp, "Total Violation: ");
+
+        FORM_ADD_INPUT2(Setup, Thresh,  rect, rectInp, "On Threshold: ", 6, 0, 999999, NULL, &g_setup.onThresh, FORM_FLOAT, NULL, "Enter the on threshold");
+        AdvanceInputRects(rect, rectInp);
+        FORM_ADD_INPUT2(Setup, ViolTot, rect, rectInp, "Total Violation: ", 6, 0, 999999, NULL, &g_setup.violWt[0], FORM_FLOAT, NULL, "Enter violation weight for total");
+        AdvanceInputRects(rect, rectInp);
+        FORM_ADD_INPUT2(Setup, Viol1,   rect, rectInp, "P1 Violation: ", 6, 0, 999999, NULL, &g_setup.violWt[1], FORM_FLOAT, NULL, "Violation weight for P1");
+#else
+        FORM_INIT(Setup, EventPresetScreenShow, NULL, NULL, NULL, nFormFlgShowHelp);
+        FORM_ADD_INPUT(Setup, Thresh, 0, FONT_HEIGHT * 2, "On Threshold: ", 6, 0, 999999, NULL, &g_setup.onThresh, FORM_FLOAT, NULL, "Enter the on threshold");
+        FORM_ADD_INPUT(Setup, ViolTot, 0, FONT_HEIGHT * 4, "Total violation: ", 6, 0, 999999, NULL, &g_setup.violWt[0], FORM_FLOAT, NULL, "Enter violation weight for total");
+        FORM_ADD_INPUT(Setup, Viol1, 0, FONT_HEIGHT * 6, "P1 Violation: ", 6, 0, 999999, NULL, &g_setup.violWt[1], FORM_FLOAT, NULL, "Violation weight for P1");
+#endif
+        FORM_SHOW(Setup);
+
+        int n = FORM_RUN(Setup);
+
+        if (n != FORM_RESULT_ESC)
+        {
+                SaveSetup();
+        }
+
+        FORM_HIDE(Setup);
+}
 
 }}}