Merge pull request #411 from pixlise/feature/expr-inputs

Feature/expr inputs

Author: pnemere

CHANGELOG.md

@@ -5,6 +5,8 @@
 - ROI Picker now remembers your last selected sections
 - MIST ROIs can now include a per-PMC confidence value column that affects ROI opacity on context image
 - **Custom ROI Colors** Adds support for custom ROI colors via a color picker. Preset colors should still be preferred where possible.
+- Expression language (in Lua only) now has 2 new functions: `readCache` and `writeCache` to allow reuse of calculated data between other expressions. Also added new constants: `instrument`, `scanId`, `quantId`, `maxSpectrumChannel` and `elevAngle`. Running expressions is also about 10% faster due to not recomputing the results of `spectrum()` calls when the same channels are requested.
+- Removed Back to V3 button
 
 ## 4.44.0 (2024-09-27)
 
@@ -20,7 +22,6 @@
 - Fixes bug with sharing workspaces that include expression groups
 - Allows longer RGB Mix names to be saved
 
-
 ## 4.42.0 (2024-09-18)
 
 ### Bug Fixes

client/src/app/components/toolbar/toolbar.component.html

@@ -28,20 +28,13 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 -->
-<ng-template #v3ConfirmDialog>
-  <feedback-dialog></feedback-dialog>
-</ng-template>
 
 <ng-template #changeLogDialog>
   <div class="change-log-container">
     <h1>
       Change Log (Updated {{ uiVersionLastCommitDate * 1000 | date: "mediumDate" }})
       <action-button (onClick)="closeChangeLogDialog()" action="close" color="rgb(var(--clr-gray-30))"></action-button>
     </h1>
-    <div class="v3-container">
-      <span class="title">NOTE: PIXLISE v3 will be retired at the end of September 2024!</span>
-      <push-button class="back-to-v3" [customDialog]="v3ConfirmDialog" buttonStyle="v3Button">Back to v3</push-button>
-    </div>
     <div class="change-log">
       <markdown lineHighlight [lineOffset]="5" src="/assets/CHANGELOG.md"> </markdown>
     </div>
@@ -154,7 +147,6 @@ <h1>
         <!-- <span>Updated {{ uiVersionLastCommitDate * 1000 | date: "mediumDate" }}</span> -->
         <span>{{ uiVersion }}</span>
       </push-button>
-      <!-- <push-button class="back-to-v3" [customDialog]="v3ConfirmDialog" buttonStyle="v3Button">Back to v3</push-button> -->
       <icon-button
         title="Notifications"
         (click)="onNotificationsMenu()"

client/src/app/components/toolbar/toolbar.component.scss

@@ -138,10 +138,6 @@
           }
         }
       }
-
-      .back-to-v3 {
-        white-space: pre;
-      }
     }
   }
 }
@@ -247,25 +243,6 @@ user-icon {
     }
   }
 
-  .v3-container {
-    display: flex;
-    align-items: center;
-
-    padding-left: 16px;
-
-    border-top: 1px solid rgb(68, 76, 80);
-    padding-top: 8px;
-
-    margin-right: -16px;
-    padding-right: 16px;
-
-    color: rgb(var(--clr-gray-30));
-
-    .back-to-v3 {
-      margin-left: auto;
-    }
-  }
-
   .change-log {
     height: 400px;
     width: 600px;

client/src/app/components/toolbar/toolbar.component.ts

@@ -708,25 +708,6 @@ export class ToolbarComponent implements OnInit, OnDestroy {
     return "https://discuss." + EnvConfigurationInitService.appConfig.appDomain;
   }
 
-  private closeIssueDialog(): void {
-    if (this.submitIssueDialog && this.submitIssueDialog instanceof PushButtonComponent) {
-      (this.submitIssueDialog as PushButtonComponent).closeDialog();
-    }
-  }
-
-  onSubmitIssue(leftPage: boolean): void {
-    let strippedIssue = this.userIssue.trim();
-    if (strippedIssue.length > 0) {
-      this._snackService.openSuccess("Thanks for the feedback!");
-      this.userIssue = "";
-      SentryHelper.logMsg(false, "User Feedback (Back to V3): \n" + strippedIssue);
-    } else if (leftPage) {
-      SentryHelper.logMsg(false, "User Feedback (Back to V3): No feedback given");
-    }
-
-    this.closeIssueDialog();
-  }
-
   closeChangeLogDialog(): void {
     if (this.changeLogBtn && this.changeLogBtn instanceof PushButtonComponent) {
       (this.changeLogBtn as PushButtonComponent).closeDialog();

client/src/app/modules/pixlisecore/components/atoms/buttons/push-button/push-button.component.ts

@@ -46,7 +46,6 @@ export type PushButtonStyle =
   | "orange"
   | "dark-outline"
   | "hover-yellow"
-  | "v3Button"
   | "changelog-new"
   | "changelog-viewed";
 
@@ -96,7 +95,6 @@ export class PushButtonComponent implements OnInit {
       "orange",
       "dark-outline",
       "hover-yellow",
-      "v3Button",
       "changelog-new",
       "changelog-viewed",
     ];

client/src/app/modules/pixlisecore/components/feedback-dialog/feedback-dialog.component.html

@@ -8,7 +8,6 @@
   </div>
   <textarea [(ngModel)]="userIssue" [rows]="10" class="feedback-textarea" placeholder="Type your issue here"></textarea>
   <div class="bottom-buttons">
-    <push-button class="submit-and-stay" buttonStyle="v3Button" (click)="onSubmitIssue(false)" #submitIssue>Submit feedback</push-button>
-    <a (click)="onSubmitIssue(true)" class="link-to-v3" href="https://v3.pixlise.org" target="_blank">Open v3</a>
+    <push-button class="submit-and-stay" (click)="onSubmitIssue()" #submitIssue>Submit feedback</push-button>
   </div>
 </div>

client/src/app/modules/pixlisecore/components/feedback-dialog/feedback-dialog.component.scss

@@ -44,34 +44,4 @@
       text-decoration: none;
     }
   }
-
-  .link-to-v3 {
-    // margin-left: auto;
-  }
-}
-
-.link-to-v3 {
-  color: black;
-  background-color: rgb(255, 255, 141);
-
-  // color: #f8f8f8;
-  text-align: center;
-  font-feature-settings:
-    "clig" off,
-    "liga" off;
-  font-family: Inter;
-  font-size: 12px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 16px;
-  border-radius: 4px;
-  // background: #444c50;
-  padding: 4px 8px;
-  margin-right: 4px;
-  cursor: pointer;
-
-  &:hover {
-    color: rgb(var(--clr-gray-60));
-    text-decoration: none;
-  }
 }

client/src/app/modules/pixlisecore/components/feedback-dialog/feedback-dialog.component.ts

@@ -34,14 +34,12 @@ export class FeedbackDialogComponent {
     this.dialogRef.close(false);
   }
 
-  onSubmitIssue(backToV3: boolean = false): void {
+  onSubmitIssue(): void {
     let strippedIssue = this.userIssue.trim();
     if (strippedIssue.length > 0) {
       this._snackService.openSuccess("Thanks for the feedback!");
       this.userIssue = "";
-      SentryHelper.logMsg(false, "User Feedback (Back to V3): \n" + strippedIssue);
-    } else if (backToV3) {
-      SentryHelper.logMsg(false, "User Feedback (Back to V3): No feedback given");
+      SentryHelper.logMsg(false, "User Feedback: \n" + strippedIssue);
     }
 
     this.dialogRef.close(true);