Merge branch 'DanWBR:windows' into windows

mersadk · Apr 19, 2024 · f9725a8 · f9725a8
2 parents 9faa61e + bc1f2bb
commit f9725a8
Show file tree

Hide file tree

Showing 13 changed files with 1,220 additions and 1,192 deletions.
diff --git a/DWSIM.ProFeatures/FormBridgeToPro.cs b/DWSIM.ProFeatures/FormBridgeToPro.cs
@@ -9,11 +9,14 @@ public partial class FormBridgeToPro : Form
     {
 
         public IFlowsheet CurrentFlowsheet;
+        public IAnalyticsProvider AnalyticsProvider;
         private bool Transitioning = false;
 
-        public FormBridgeToPro(bool? skipIntro = false)
+        public FormBridgeToPro(IAnalyticsProvider analytics, bool? skipIntro = false)
         {
             InitializeComponent();
+            AnalyticsProvider = analytics;
+            formPortal.AnalyticsProvider = analytics;
             lblFeature = _lblFeature;
             _lblFeature.Name = "lblFeature";
 
@@ -46,6 +49,8 @@ private void SwitchToFormPortal()
         private void Button2_Click(object sender, EventArgs e)
         {
 
+            AnalyticsProvider?.RegisterEvent("Portal Window: User Clicked 'Switch to Pro'", lblFeature.Text, null);
+
             Transitioning = true;
             SwitchToFormPortal();
 
@@ -59,7 +64,10 @@ private void FormBridgeToPro_FormClosing(object sender, System.Windows.Forms.For
         {
 
             if (!Transitioning && CurrentFlowsheet != null)
+            {
+                AnalyticsProvider?.RegisterEvent("Portal Window: Closed by User", lblFeature.Text, null);
                 CurrentFlowsheet.FlowsheetOptions.FlowsheetTransitionObject = null;
+            }
 
         }
 

diff --git a/DWSIM.ProFeatures/FormCosting.cs b/DWSIM.ProFeatures/FormCosting.cs
@@ -10,6 +10,8 @@ public partial class FormCosting : WeifenLuo.WinFormsUI.Docking.DockContent
 
         public IFlowsheet CurrentFlowsheet;
 
+        public IAnalyticsProvider AnalyticsProvider;
+
         public FormCosting()
         {
             InitializeComponent();
@@ -22,7 +24,7 @@ private void Button2_Click(object sender, EventArgs e)
 
             Functions.CreateTransitionObject(CurrentFlowsheet, "", "Costing", "", "", default);
 
-            Functions.DisplayTransitionForm(CurrentFlowsheet, "Costing");
+            Functions.DisplayTransitionForm(AnalyticsProvider, CurrentFlowsheet, "Costing");
 
         }
 

diff --git a/DWSIM.ProFeatures/FormGHG.cs b/DWSIM.ProFeatures/FormGHG.cs
@@ -12,6 +12,8 @@ public partial class FormGHG : WeifenLuo.WinFormsUI.Docking.DockContent
 
         public IFlowsheet CurrentFlowsheet;
 
+        public IAnalyticsProvider AnalyticsProvider;
+
         public FormGHG()
         {
             InitializeComponent();
@@ -24,7 +26,7 @@ private void Button2_Click(object sender, EventArgs e)
 
             Functions.CreateTransitionObject(CurrentFlowsheet, "", "GHG Emissions", "", "", default);
 
-            Functions.DisplayTransitionForm(CurrentFlowsheet, "GHG Emissions");
+            Functions.DisplayTransitionForm(AnalyticsProvider, CurrentFlowsheet, "GHG Emissions");
 
         }
 

diff --git a/DWSIM.ProFeatures/FormPortal.cs b/DWSIM.ProFeatures/FormPortal.cs
@@ -21,6 +21,7 @@ namespace DWSIM.ProFeatures
     public partial class FormPortal : UserControl
     {
         private bool IsLoadingLicenseInfo = false;
+        public IAnalyticsProvider AnalyticsProvider;
         private int TrialLicenseCreatedMessageCount = 0;
         private bool FileSavingInProgress = false;
         private Timer Timer1 = new Timer() { Interval = 5000 };
@@ -74,15 +75,18 @@ public async Task OnInitialize()
             {
                 if (licenseInfo.hasExistingLicense.HasValue & licenseInfo.hasExistingLicense.Value)
                 {
+                    AnalyticsProvider?.RegisterEvent("Portal Window 2: License Eligible For Trial", "", null);
                     SaveFlowsheet();
                 }
                 else if (licenseInfo.notEligibleForTrial.HasValue & licenseInfo.notEligibleForTrial.Value)
                 {
+                    AnalyticsProvider?.RegisterEvent("Portal Window 2: License Not Eligible For Trial", "", null);
                     LoadingPanel.Visible = false;
                     NoLicensePanel.Visible = true;
                 }
                 else if ((licenseInfo.trialLicenseCreated & licenseInfo.trialLicenseCreated.Value) == true)
                 {
+                    AnalyticsProvider?.RegisterEvent("Portal Window 2: Trial License Created Successfully", "", null);
                     TrialLicenseCreatedLogic();
                 }
 
@@ -158,11 +162,13 @@ private async Task<LicenseResponseModel> GetLicenseInfo()
                 }
                 else
                 {
+                    AnalyticsProvider?.RegisterEvent("Portal Window 2: License Check Failed", response.ReasonPhrase, null);
                     MessageBox.Show("Error: " + response.StatusCode.ToString() + " - " + response.ReasonPhrase);
                 }
             }
             catch (Exception ex)
             {
+                AnalyticsProvider?.RegisterEvent("Portal Window 2: License Check Failed", ex.Message, null);
                 MessageBox.Show("An error occurred: " + ex.Message);
             }
             finally
@@ -174,6 +180,7 @@ private async Task<LicenseResponseModel> GetLicenseInfo()
 
         private void ShowSuccessPanel()
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: Open-Source to Pro Workflow Finished Successfully", "", null);
             if (this.InvokeRequired)
             {
                 this.Invoke(new Action(ShowSuccessPanel));
@@ -257,17 +264,20 @@ private async Task<bool> SaveDwsimProStartupAction()
 
         private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Go to Shop'", "", null);
             Process.Start("https://simulate365.com/shop/");
         }
 
         private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Login'", "", null);
             var loginForm = new LoginForm(true);
             loginForm.ShowDialog();
         }
 
         private void openInDefaultBrowserLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Open Browser (Normal)'", "", null);
             Process.Start("https://vm.simulate365.com");
         }
 
@@ -314,11 +324,13 @@ private static string GetStandardBrowserProgId()
 
         private void button1_Click(object sender, EventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Go to Shop'", "", null);
             Process.Start("https://simulate365.com/shop/");
         }
 
         private void button3_Click(object sender, EventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Open Browser in Private Mode'", "", null);
             string privateModeParam = string.Empty;
             var url = "https://vm.simulate365.com";
             var browserProgId = GetStandardBrowserProgId()?.ToLower();
@@ -355,11 +367,13 @@ private void button3_Click(object sender, EventArgs e)
 
         private void button2_Click(object sender, EventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Open Browser (Normal)'", "", null);
             Process.Start("https://vm.simulate365.com");
         }
 
         private void saveToDashboardBtn_Click(object sender, EventArgs e)
         {
+            AnalyticsProvider?.RegisterEvent("Portal Window 2: User Clicked 'Save to Dashboard'", "", null);
             this.FileSavingInProgress = true;
             // We fire event to save file and continue on FileManagementService_FileSavedToDashboard
             FileManagementService.GetInstance().SaveFileToDashboard();

diff --git a/DWSIM.ProFeatures/Functions.cs b/DWSIM.ProFeatures/Functions.cs
@@ -21,10 +21,12 @@ public static bool ProcessTransition(IFlowsheet flowsheet)
 
         }
 
-        public static void DisplayTransitionForm(IFlowsheet flowsheet, string featurename, bool? skipIntro = false)
+        public static void DisplayTransitionForm(IAnalyticsProvider analyticsprovider, IFlowsheet flowsheet, string featurename, bool? skipIntro = false)
         {
-
-            var fp = new FormBridgeToPro(skipIntro);
+
+            analyticsprovider?.RegisterEvent("Portal Window: User Clicked to Open", featurename, null);
+
+            var fp = new FormBridgeToPro(analyticsprovider, skipIntro);
             fp.lblFeature.Text = featurename;
             fp.CurrentFlowsheet = flowsheet;
             fp.ShowDialog();

diff --git a/DWSIM/Forms/Flowsheet/FormFlowsheet.Designer.vb b/DWSIM/Forms/Flowsheet/FormFlowsheet.Designer.vb
diff --git a/DWSIM/Forms/Flowsheet/FormFlowsheet.resx b/DWSIM/Forms/Flowsheet/FormFlowsheet.resx
@@ -785,29 +785,29 @@
   <data name="tsbDynIntegrator.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        t3clJf0D4h37KXkhYZoAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAUSSURBVFhHxVdbU1NXFOal7+1j+zPa5z45007pgw/ttE/W
+        SwWFUrUo14pBijjxVgFRlKsULBUUZawBARNIYENu5ySQhFwgoQPeKI46fe7q/lbcp5CEFhnUM/PN3vvb
+        62R9Z+21Vs7JUpfp57Z3y82tH5aeafrodaLI3PzBS5f/XpW1HSUn6rqXm3oGlrtuWJ83y3E1WnqHngKp
+        fCbb1psjK1f7R5+l8uCwd7r1xpOq+o7ul66zskpPXnwPzuNPntPC8gu6r0d5XA197iEjlc9kO7u4QiK4
+        kMaDwx7mF3pur5SZr3zMAhD2S72DT5ThmxBgMpn+LjvVnMMCcC4IJX4MsLhCPK7GkCfMSOUz2Q5rERp0
+        z6bx4LCHuUX4SfrNNQTgjJRSGKi5wuoIxOcXDT6T7UYiYBnXNi8gPDBi8G9FwMyFRoN/8wJkpXgP/mDw
+        WyYANa6cINnUXGEisMDQ9DBNfvW1wWeydYUXyabPpfHgsIe5ZULfnACvVZD45FPSo0tpttqExuOmBGz0
+        CMKWYRLbttF8JJFmG/y1hxIPV7YmB+LRBYbilIBg1280+Vk2RYXHsFU202fP05we3BoBEauDohKKUwKm
+        6xrIW3CAwr8PGrbKRisq4RLdEgHBzm6G4pQAvbKKps/XU7DjmmGrbFw7vqFAe+fmBKS2YntFFUNxSDZg
+        PDePRn+5TmPVZsOWbbQwiexsec/xrWnFngOHGIpTEXB/u5fm/LOkHzUZthjngzG29x4qzBgB3PNKRwBH
+        gOJYQOwBuXNyKbH0J3nyCwxbjJHhMc4P996cNAGomJnGplcQIGvUI7sdEI8/YA4CNF+EvIWHea3EKQGo
+        jtD1m+TJy6dQ4tEaAUhY3LdhAbZbA+Q7dZYRHXcyBwFe2yT5qk/yGpFAW1YCUIKRMUG66TgFnP41AqbP
+        1dLU9u0kAon1BeBVCZuA7VIb6e3XyNfWRb6uHuacsoNN9fSTVt/Ia3dhEQVnYjTsjSTXh4spFJDdT/5R
+        efssZJ+OMw+49uXxvmPQTr75x8zdTe2EeF+DamC0sobErUGJARI1p5iz+WI01tBMoqWT18JUTcJipUFX
+        MrnErj38hOJqN43XX6ERKYx5GSGxJ4fE5TYalfc7pDDwFuFb/wgcBQeNTug9UswcjsB1WoZZJhvWM1da
+        +GxxBInHz8izbz/z0Qk3eU+Y2Qmv7ZPkN5+hmNtHoqyCnx78f+bAxI6dPALIaowQ4CyvoDktwOtQ721u
+        RhCAEtTkHvj4/BK5ZPIqAYHmdprtu8MiEaX/FYASG9+7j40AT953lFhcZgFTmP/xmHm0ar/siBCgSlDd
+        45QVogRoJWUsEHOR/z3nCebrCog5dXKUHzN+zPdTDcVcelLArt0Gz82oopIFoGWHevqMPSSd8EtHskrc
+        8qkVL87Ukv/2AM/TBPRevPiXOFZFQp6/7WxDMoEAmVDgHEcr+WgM3ieT64svabTsGImdu0n03zP2Jop/
+        JMeRUj5zIatF8dbuWzIhZXSkn5FLrWsFtLT0Pg3YXQSMOHSjhELhBeacQ3aaGnMZPBBwuOl+/xDvh+KP
+        DF73BMlx18p80J8sU8CuRUmTLzTgB+S+IaD8XOP7+FxSoVLNZTVwBEAqn8kWzvDEqTw47GHeeefei+LT
+        zZ+zAFz4VsPnEr5Y8E+FM1oD2TgYqXwGWzQZ1HkqDw57cH68rkPLvXz5nZfukxe+1fC5hNC8TuDJ05y/
+        vSsr6x/Sg/sn4zfkyQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="tsbDynIntegrator.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">

diff --git a/DWSIM/Forms/Flowsheet/FormFlowsheet.vb b/DWSIM/Forms/Flowsheet/FormFlowsheet.vb
@@ -363,9 +363,9 @@ Public Class FormFlowsheet
         End If
 
         If Not FormMain.IsPro Then
-            Dim fg As New ProFeatures.FormGHG With {.CurrentFlowsheet = Me}
+            Dim fg As New ProFeatures.FormGHG With {.CurrentFlowsheet = Me, .AnalyticsProvider = FormMain.AnalyticsProvider}
             fg.Show(dckPanel)
-            Dim fc As New ProFeatures.FormCosting With {.CurrentFlowsheet = Me}
+            Dim fc As New ProFeatures.FormCosting With {.CurrentFlowsheet = Me, .AnalyticsProvider = FormMain.AnalyticsProvider}
             fc.Show(dckPanel)
         End If
 
@@ -5549,23 +5549,23 @@ Public Class FormFlowsheet
 
         ProFeatures.Functions.CreateTransitionObject(Me, "Stream Data Importer", "Tool", "", "", Nothing)
 
-        ProFeatures.Functions.DisplayTransitionForm(Me, "Stream Data Importer")
+        ProFeatures.Functions.DisplayTransitionForm(FormMain.AnalyticsProvider, Me, "Stream Data Importer")
 
     End Sub
 
     Private Sub ExcelReportsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExcelReportsToolStripMenuItem.Click
 
         ProFeatures.Functions.CreateTransitionObject(Me, "Excel Reports", "Tool", "", "", Nothing)
 
-        ProFeatures.Functions.DisplayTransitionForm(Me, "Excel Reports")
+        ProFeatures.Functions.DisplayTransitionForm(FormMain.AnalyticsProvider, Me, "Excel Reports")
 
     End Sub
 
     Private Sub ProcessFlowsheetDiagramToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ProcessFlowsheetDiagramToolStripMenuItem.Click
 
         ProFeatures.Functions.CreateTransitionObject(Me, "Process Flowsheet Diagram", "Tool", "", "", Nothing)
 
-        ProFeatures.Functions.DisplayTransitionForm(Me, "Process Flowsheet Diagram")
+        ProFeatures.Functions.DisplayTransitionForm(FormMain.AnalyticsProvider, Me, "Process Flowsheet Diagram")
 
     End Sub
 

diff --git a/DWSIM/Forms/FlowsheetComponents/FlowsheetSurfaceSkiaSharp/FlowsheetSurfaceControl.vb b/DWSIM/Forms/FlowsheetComponents/FlowsheetSurfaceSkiaSharp/FlowsheetSurfaceControl.vb
@@ -311,7 +311,7 @@ Public Class FlowsheetSurfaceControl
 
                     ProFeatures.Functions.CreateTransitionObject(FlowsheetObject, name, "Unit Operation", "Add", otype, New Double() {e.X / FlowsheetSurface.Zoom, e.Y / FlowsheetSurface.Zoom})
 
-                    ProFeatures.Functions.DisplayTransitionForm(FlowsheetObject, name & " Unit Operation")
+                    ProFeatures.Functions.DisplayTransitionForm(FormMain.AnalyticsProvider, FlowsheetObject, name & " Unit Operation")
 
                     Exit Sub
 

diff --git a/DWSIM/Forms/FormSimulSettings.vb b/DWSIM/Forms/FormSimulSettings.vb
@@ -1333,7 +1333,7 @@ Public Class FormSimulSettings
 
             ProFeatures.Functions.CreateTransitionObject(CurrentFlowsheet, DataGridViewPP.SelectedRows(0).Cells(2).Value, "Property Package", "Add", "Simulation Settings", Nothing)
 
-            ProFeatures.Functions.DisplayTransitionForm(CurrentFlowsheet, DataGridViewPP.SelectedRows(0).Cells(2).Value + " Property Package")
+            ProFeatures.Functions.DisplayTransitionForm(FormMain.AnalyticsProvider, CurrentFlowsheet, DataGridViewPP.SelectedRows(0).Cells(2).Value + " Property Package")
 
             Exit Sub
 

diff --git a/DWSIM/Forms/FormSimulWizard.vb b/DWSIM/Forms/FormSimulWizard.vb
@@ -278,7 +278,7 @@ Public Class FormSimulWizard
 
             ProFeatures.Functions.CreateTransitionObject(CurrentFlowsheet, DataGridViewPP.SelectedRows(0).Cells(4).Value, "Property Package", "Add", "Simulation Wizard", Nothing)
 
-            ProFeatures.Functions.DisplayTransitionForm(CurrentFlowsheet, DataGridViewPP.SelectedRows(0).Cells(4).Value + " Property Package")
+            ProFeatures.Functions.DisplayTransitionForm(FormMain.AnalyticsProvider, CurrentFlowsheet, DataGridViewPP.SelectedRows(0).Cells(4).Value + " Property Package")
 
             Exit Sub
 

diff --git a/DWSIM/Forms/FormWelcome.en.resx b/DWSIM/Forms/FormWelcome.en.resx
@@ -122,7 +122,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAo
-        KQAAAk1TRnQBSQFMAgEBBAEAAYABAAGAAQABIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        KQAAAk1TRnQBSQFMAgEBBAEAAYgBAAGIAQABIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABQAMAAQEBAAEQBgABQP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AQAABPwE3AT8BNwE/ATcBPwE3AT8BNwE/ATcBPwE3AT8BNwE/
         ATcBPwE3AT8BNwE/ATcBPwE3AT8BNwE/ATcBPwE3AT8BNwE/ATcBPwE3AT8BNwE/ATcWAAE/ATcBPwE3
@@ -393,7 +393,7 @@
     <value>168, 5</value>
   </data>
   <data name="LinkLabel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>254, 16</value>
+    <value>258, 16</value>
   </data>
   <data name="LinkLabel3.Text" xml:space="preserve">
     <value>Load File from Simulate 365 Dashboard</value>
@@ -492,14 +492,14 @@
     <value>13, 82</value>
   </data>
   <data name="LinkLabel7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>312, 24</value>
+    <value>308, 24</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="LinkLabel7.TabIndex" type="System.Int32, mscorlib">
     <value>102</value>
   </data>
   <data name="LinkLabel7.Text" xml:space="preserve">
-    <value>DWSIM and DWSIM Pro Features Comparision </value>
+    <value>DWSIM and DWSIM Pro Features Comparison </value>
   </data>
   <data name="Label6.Location" type="System.Drawing.Point, System.Drawing">
     <value>13, 37</value>
@@ -698,7 +698,7 @@
     <value>13, 10</value>
   </data>
   <data name="Label14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>313, 19</value>
+    <value>317, 19</value>
   </data>
   <data name="Label14.TabIndex" type="System.Int32, mscorlib">
     <value>97</value>
@@ -750,7 +750,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO
-        pAAAAk1TRnQBSQFMAgEBBAEAAVgBAAFYAQABQAEAAUABAAT/AREBAAj/AUIBTQE2BwABNgMAASgEAAEB
+        pAAAAk1TRnQBSQFMAgEBBAEAAWABAAFgAQABQAEAAUABAAT/AREBAAj/AUIBTQE2BwABNgMAASgEAAEB
         AgABgAMAAQEBAAEQBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A