V0.09.09h 2023/03/12

* Added:
  - GUI: working for inputs settings, circuits shown and results
         GUI debug output still goes to CLI
  - GUI: read custom formula from text entry
  - GUI: read custom values from text entry
  - GUI: extend textView vertically when window increase height
  - GUI: force refresh output while heavy calculation
  - GUI: autoscroll to last line
  - show allocated memory with SI prefix k,M,G,T
  - show calc and sort progress as percentage
  - generation of Linux AppImage

Author: efa

README.md

@@ -286,26 +286,28 @@ V0.09.09h 2023/03/12
          GUI debug output still goes to CLI
   - GUI: read custom formula from text entry
   - GUI: read custom values from text entry
-  - GUI: output force refresh while heavy calculation
+  - GUI: extend textView vertically when window increase height
+  - GUI: force refresh output while heavy calculation
   - GUI: autoscroll to last line
   - show allocated memory with SI prefix k,M,G,T
+  - show calc and sort progress as percentage
   - generation of Linux AppImage
 
 ToDo:
 -----
-- show calc and sort progress as percent
 - On memory low: option to keep only the first N best results and discard
   others, autosorting of results while keeping first N best results
 - On memory low: save block of results to disk and deallocate memory
 - remove duplicated triangular solutions with MaxRp=2
-- first print exact results, separated by approximate results
+- print exact results, separated by approximate results
 - separate value below and over the target value (show delta sign)
 - support for 0 Ohm value in formula denominator (division by 0)
 - add support for variables with an index number. Es. R1, R2
 - add support for variables/letters other than a-b. Autoinit values
 - Made generic the number of total values, based on variables number in formula
 - For each position of resistance in circuit, add support for 'Rp' resistances
   in series or parallel. Probably not possible with current resources.
+- make a distribution package for macOS
 - GUI: working Stop and About buttons
 - GUI: better circuit images
 - GUI: show best results value in circuit

ReSolveGUI.png

@@ -23,7 +23,7 @@ Author: Valerio Messina
 -->
 <!-- GUI resource file for reSolve -->
 <interface>
-  <requires lib="gtk+" version="3.6"/>
+  <requires lib="gtk+" version="3.22"/>
   <!-- interface-license-type lgplv3 -->
   <!-- interface-name ReSolve -->
   <!-- interface-copyright 2022-2023 Valerio Messina -->
@@ -53,6 +53,7 @@ Author: Valerio Messina
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
+        <property name="vexpand">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
@@ -391,11 +392,11 @@ operators: +,-,*,/,%,^, parentesis () with any depth</property>
             <property name="shadow-type">in</property>
             <property name="min-content-width">642</property>
             <property name="min-content-height">342</property>
+            <property name="propagate-natural-height">True</property>
             <child>
               <object class="GtkTextView" id="textview">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="vexpand">True</property>
                 <property name="editable">False</property>
                 <property name="wrap-mode">char</property>
                 <property name="buffer">output</property>

ReSolveGui-i386.AppImage

@@ -286,26 +286,28 @@ V0.09.09h 2023/03/12
          GUI debug output still goes to CLI
   - GUI: read custom formula from text entry
   - GUI: read custom values from text entry
-  - GUI: output force refresh while heavy calculation
+  - GUI: extend textView vertically when window increase height
+  - GUI: force refresh output while heavy calculation
   - GUI: autoscroll to last line
   - show allocated memory with SI prefix k,M,G,T
+  - show calc and sort progress as percentage
   - generation of Linux AppImage
 
 ToDo:
 -----
-- show calc and sort progress as percent
 - On memory low: option to keep only the first N best results and discard
   others, autosorting of results while keeping first N best results
 - On memory low: save block of results to disk and deallocate memory
 - remove duplicated triangular solutions with MaxRp=2
-- first print exact results, separated by approximate results
+- print exact results, separated by approximate results
 - separate value below and over the target value (show delta sign)
 - support for 0 Ohm value in formula denominator (division by 0)
 - add support for variables with an index number. Es. R1, R2
 - add support for variables/letters other than a-b. Autoinit values
 - Made generic the number of total values, based on variables number in formula
 - For each position of resistance in circuit, add support for 'Rp' resistances
   in series or parallel. Probably not possible with current resources.
+- make a distribution package for macOS
 - GUI: working Stop and About buttons
 - GUI: better circuit images
 - GUI: show best results value in circuit

ReSolveGui-x86_64.AppImage

@@ -380,7 +380,7 @@ static void aboutButton(GtkWidget* widgetPtr, gpointer dataPtr) {
    g_print("About button\n");
 }
 
-int quit() {
+int quit() { // called also on Window destroy
    // free mem allocated by fillConfigVars()
    if (baseR) free (baseR);
    if (baseRconf) free (baseRconf);
@@ -501,28 +501,32 @@ int guiInit(int argc, char *argv[]) {
 
    /* Construct a GtkBuilder instance and load our UI description */
    builderPtr = gtk_builder_new();
-
+   //printf ("Try to load 'reSolve.glade'\n");
 #if 0
-   GError* errorPtr = NULL;
-   if (gtk_builder_add_from_file(builderPtr, "reSolve.glade", &errorPtr) == 0) {
-      g_printerr ("Error loading file: %s\n", errorPtr->message);
-      g_clear_error (&errorPtr);
-      return 1;
-   }
-#endif
    builderPtr=gtk_builder_new_from_file("reSolve.glade");
+   printf ("gtk_builder_new_from_file() returned:%p\n", builderPtr);
    if (builderPtr == NULL) {
       //g_printerr ("Error loading file: %s\n", errorPtr->message);
       //g_clear_error (&errorPtr);
+      printf ("'reSolve.glade' not found, quit\n");
       return 1;
    }
+#endif
+   GError* errorPtr = NULL;
+   gboolean bit;
+   bit = gtk_builder_add_from_file(builderPtr, "reSolve.glade", &errorPtr);
+   if (bit == 0) {
+      g_printerr ("Error loading file: %s\n", errorPtr->message);
+      g_clear_error (&errorPtr);
+      return 1;
+   }
+   //printf ("'reSolve.glade' loaded\n");
 
    /* Connect signal handlers to the constructed widgets */
    windowPtr = gtk_builder_get_object (builderPtr, "window");
    g_signal_connect (windowPtr, "destroy", G_CALLBACK(quit), NULL);
 
    //gtk_builder_connect_signals(builderPtr, NULL); // seems unnecessary
-
    widgetPtr = gtk_builder_get_object (builderPtr, "formulaList");
    g_signal_connect (widgetPtr, "changed", G_CALLBACK(formulaPre), NULL);
    widgetPtr = gtk_builder_get_object (builderPtr, "formula");
@@ -681,6 +685,10 @@ int main(int argc, char *argv[]) {
    gtk_disable_setlocale();
    printf ("Starting GUI ...\n");
    ret = guiInit(argc, argv);
+   if (ret!=0) {
+      printf ("GUI cannot be initialized, quit\n");
+      exit (1);
+   }
    ret = guiUpdateIn();
 
    //ret=runReSolve(); // steps 6 to 12 called by widget callbacks

circuit03.png

@@ -626,6 +626,7 @@ int calcRvalues(void) { /* in series or parallel, support MaxRp=2 only */
 int calcFvalues(void) {
    u32 rc1, rc2;
    /*float res[maxRc];*/ /* single case, normally 2 resistances */
+   register u64 per; // percentage progress
    register double val;
    register double delta = 0;
    register u32 pos = 0;
@@ -649,13 +650,16 @@ int calcFvalues(void) {
          results[pos].delta  = delta;
          pos++;
       }
-      if (rc1%1000==0) {
-         if (dbgLv>=PRINTF) gprintf (gui, "%u,", rc1*numV);
+      if (rc1%1000==0) { // here print something for user feedback (take time)
+         //if (dbgLv>=PRINTF) gprintf (gui, "%u,", rc1*numV);
+         per=(u64)rc1*numV*100/totV;
+         if (dbgLv>=PRINTF) gprintf (gui, "%d%%,", per);
          fflush (NULL); // user space stdout flush
          fsync (1);   // kernel space stdout flush
       }
    }
-   if (dbgLv>=PRINTF) gprintf (gui, "%u\n", rc1*numV-1);
+   //if (dbgLv>=PRINTF) gprintf (gui, "%u\n", rc1*numV-1); // here print something for user feedback (take time)
+   if (dbgLv>=PRINTF) gprintf (gui, "100%\n"); // here print something for user feedback (take time)
    return (OK);
 } // int calcFvalues(void) {
 
@@ -665,11 +669,14 @@ s32 tot; // used for communication between 'structQuickSort' & 'qsStruct'
 /* Sorting criteria: field 'abs(delta)' */
 void qsStruct(struct resultsTy results[], s32 left, s32 right) {
    register s32 l, r, m; /* position left, right and median */
+   register u64 per; // percentage progress
    float  mp; /* will contain data in center position */
    struct resultsTy temp;            /* temp struct for swap */
    static u32 qs=0;
    if (qs%20000000==0) {
-      if (dbgLv>=PRINTF) gprintf (gui, "%u,", qs);
+      //if (dbgLv>=PRINTF) gprintf (gui, "%u,", qs);
+      per=(u64)qs*100/tot;
+      if (dbgLv>=PRINTF) gprintf (gui, "%d%%,", per);
       fflush (NULL); // user space stdout flush
       fsync (1);   // kernel space stdout flush
    }
@@ -733,7 +740,8 @@ int structQuickSort(struct resultsTy results[], s32 totNumber) {
       fsync (1);   // kernel space stdout flush
    }
    qsStruct (results, 0UL, totNumber-1);
-   if (dbgLv>=PRINTF) gprintf (gui, "%d\n", totNumber-1);
+   //if (dbgLv>=PRINTF) gprintf (gui, "%d\n", totNumber-1);
+   if (dbgLv>=PRINTF) gprintf (gui, "100%%\n");
    if (dbgLv>=PRINTDEBUG) {
       for (s32 c=0; c<tot; c++) {
          printf ("f[%2d]=%11G\n", c, results[c].delta);