Merge pull request #309 from StoXProject/develop

Develop

NEWS.md

@@ -1,3 +1,18 @@
+# StoX v4.1.2-9001 (2025-01-12)
+
+## Summary
+* The StoX version 4.1.2-9001 is a pre-release to the patch release 4.1.2 which fixes a critical bug which causes the GUI to freeze if a process listed in the OutputProcesses of a Bootstrap process is renamed.
+
+## General changes
+* Changed the behavior of DefinitionMethod = "Manual" from deleting all strata, to passing the StratumPolygon as output unchanged. In addition, a new option is added, "DeleteAllStrata", which replaces the old behavior of DefinitionMethod = "Manual".
+
+## Bug fixes
+* Fixed a bug where the GUI freezes if a process listed in the OutputProcesses of a Bootstrap process is renamed.
+
+## Detailed changes
+* Added formal support for R 4.4 in the GUI.
+
+
 # StoX v4.1.1 (2024-12-20)
 
 ## Summary

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stox",
-  "version": "4.1.1",
+  "version": "4.1.2-9001",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

frontend/src/app/dlg/RConnectionDlg.html

@@ -2,7 +2,7 @@
   <p>Path to R Bin:</p>
   <input style="width: calc(100% - 22px)" type="text" pInputText [(ngModel)]="service.rpath" />
   <button style="width: 22px" type="button" pButton icon="pi pi-ellipsis-h" (click)="service.browse()"></button>
-  <p>The path to R bin (location to binary executable) is the folder where the R binary is located (for example C:\Program Files\R\R-4.4.1\bin\x64 on Windows). StoX will use this path to trigger R commands.</p>
+  <p>The path to R bin (location to binary executable) is the folder where the R binary is located (for example C:\Program Files\R\R-4.4.2\bin\x64 on Windows). StoX will use this path to trigger R commands.</p>
   <ng-template pTemplate="footer">
     <mat-spinner diameter="16" mode="indeterminate" *ngIf="service.isConnecting"></mat-spinner>
     <!--class="spinner"-->

frontend/src/app/service/project.service.ts

@@ -301,7 +301,7 @@ export class ProjectService {
     this.isOfficialStoXVersion = JSON.parse(await this.dataService.getIsOfficialStoXVersion().toPromise());
     console.log('> ' + 'this.isOfficialStoXVersion: ' + this.isOfficialStoXVersion);
     this.rstoxPackages = JSON.parse(await this.dataService.getRstoxPackageVersions().toPromise());
-    console.log('> ' + 'this.rstoxPackages: ' + this.rstoxPackages);
+    //console.log('> ' + 'this.rstoxPackages: ' + this.rstoxPackages);
 
     // Accept empty list of Rstox packages:
     if (this.rstoxPackages.length > 0) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "StoX",
   "productName": "StoX",
-  "version": "4.1.1",
+  "version": "4.1.2-9001",
   "description": "StoX: An open source software for marine survey analyses",
   "main": "build/index.js",
   "scripts": {

srv/OfficialRstoxFrameworkVersions.txt

@@ -82,3 +82,4 @@ StoX	RstoxFramework	Dependencies	OptionalDependencies	Official	Date
 4.1.0	4.1.0	RstoxBase_2.1.0,RstoxData_2.1.0	RstoxFDA_1.3.0-9003	TRUE	2024-11-07
 4.1.1-9001	4.1.1-9003	RstoxBase_2.1.1-9001,RstoxData_2.1.1-9001	RstoxFDA_1.5.0-9002	FALSE	2024-12-19
 4.1.1	4.1.1	RstoxBase_2.1.1,RstoxData_2.1.1	RstoxFDA_1.3.0	TRUE	2024-12-20
+4.1.2-9001	4.1.2-9001	RstoxBase_2.1.2-9001,RstoxData_2.1.1	RstoxFDA_1.3.0	FALSE	2025-01-10

srv/StoXGUIInternal.R

@@ -1,9 +1,7 @@
 supportedRVersion = c(
+    "4.4", 
     "4.3", 
-    "4.2", 
-    "4.1", 
-    "4.0", 
-    "3.6"
+    "4.2"
     )
 
 #' Install official Rstox packages