Refactoring "Screenshot", "zoom in", "zoom out" buttons to StripPanel.

Am6er · Mar 7, 2024 · d8a096d · d8a096d
1 parent 4f3b89b
commit d8a096d
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 376 deletions.
diff --git a/BecquerelMonitor/BecquerelMonitor.csproj b/BecquerelMonitor/BecquerelMonitor.csproj
@@ -36,7 +36,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>index.html</WebPage>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>2024.03.4.1</ApplicationVersion>
+    <ApplicationVersion>2024.03.7.1</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -1074,6 +1074,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\screenshot.bmp" />
     <None Include="Resources\pow.bmp" />
     <None Include="Resources\scale.bmp" />
     <None Include="Resources\CONT.bmp" />

diff --git a/BecquerelMonitor/DocEnergySpectrum.Designer.cs b/BecquerelMonitor/DocEnergySpectrum.Designer.cs
diff --git a/BecquerelMonitor/DocEnergySpectrum.cs b/BecquerelMonitor/DocEnergySpectrum.cs
@@ -301,6 +301,7 @@ public DocEnergySpectrum()
             this.view.DrawingMode = globalConfig.ChartViewConfig.DefaultDrawingMode;
             this.view.PeakMode = globalConfig.ChartViewConfig.DefaultPeakMode;
             this.view.HorizontalMagnification = globalConfig.ChartViewConfig.DefaultHorizontalMagnification;
+            this.view.ActionEvent += View_ActionEvent;
             this.SetToolStripIcons();
             this.toolStripNumericUpdown.NumericUpDownControl.Value = (decimal)globalConfig.ChartViewConfig.PowNum;
             toolStripContainer1.BottomToolStripPanel.SuspendLayout();
@@ -311,6 +312,11 @@ public DocEnergySpectrum()
             toolStripContainer1.BottomToolStripPanel.ResumeLayout();
         }
 
+        private void View_ActionEvent(object sender, EnergySpectrumActionEventArgs e)
+        {
+            if (e.NeedUpdateScale) this.toolStripNumUpDownScale.NumericUpDownControl.Value = e.NewScaleValue;
+        }
+
         public void RefreshDocEnergySpectrum()
         {
             GlobalConfigInfo globalConfig = GlobalConfigManager.GetInstance().GlobalConfig;
@@ -325,6 +331,7 @@ public void RefreshDocEnergySpectrum()
             this.view.DrawingMode = globalConfig.ChartViewConfig.DefaultDrawingMode;
             this.view.PeakMode = globalConfig.ChartViewConfig.DefaultPeakMode;
             this.view.HorizontalMagnification = globalConfig.ChartViewConfig.DefaultHorizontalMagnification;
+            this.view.ActionEvent += View_ActionEvent;
             this.SetToolStripIcons();
             this.toolStripNumericUpdown.NumericUpDownControl.Value = (decimal)globalConfig.ChartViewConfig.PowNum;
         }
@@ -1244,6 +1251,25 @@ void 下限閾値に設定LToolStripMenuItem_Click(object sender, EventArgs e)
             }
         }
 
+        void toolStripScreenShotButton_Click(object sender, EventArgs e)
+        {
+            this.view.takeScreenshot();
+        }
+
+        void toolStripNumUpDownScale_ValueChanged(object sender, EventArgs e)
+        {
+            this.view.zoom(this.toolStripNumUpDownScale.NumericUpDownControl.Value);
+        }
+
+        void toolStripNumUpDownScale_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                this.view.zoom(this.toolStripNumUpDownScale.NumericUpDownControl.Value);
+                e.SuppressKeyPress = true;
+            }
+        }
+
         // Token: 0x0600036A RID: 874 RVA: 0x00010C8C File Offset: 0x0000EE8C
         void 上限閾値に設定HToolStripMenuItem_Click(object sender, EventArgs e)
         {

diff --git a/BecquerelMonitor/DocEnergySpectrum.resx b/BecquerelMonitor/DocEnergySpectrum.resx
@@ -1090,4 +1090,10 @@
   <data name="powToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>180, 22</value>
   </data>
+  <data name="toolStripScreenShotButton.ToolTipText" xml:space="preserve">
+    <value>Take Screenshot to file</value>
+  </data>
+  <data name="toolStripNumUpDownScale.ToolTipText" xml:space="preserve">
+    <value>Change X scale</value>
+  </data>
 </root>
diff --git a/BecquerelMonitor/DocEnergySpectrum.ru.resx b/BecquerelMonitor/DocEnergySpectrum.ru.resx
@@ -780,4 +780,10 @@
   <data name="toolStripNumericUpdown.ToolTipText" xml:space="preserve">
     <value>Степень корня POW. Нажмите кнопку е для вовода константы Эйлера.</value>
   </data>
+    <data name="toolStripScreenShotButton.ToolTipText" xml:space="preserve">
+    <value>Снять скрин спектра в файл</value>
+  </data>
+  <data name="toolStripNumUpDownScale.ToolTipText" xml:space="preserve">
+    <value>Изменить масштаб по оси X</value>
+  </data>
 </root>