diff --git a/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.cs b/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.cs index 087a5e5..959a047 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.cs @@ -183,7 +183,7 @@ namespace BasicDemo | MyCamera.MV_GENTL_CAMERALINK_DEVICE | MyCamera.MV_GENTL_CXP_DEVICE | MyCamera.MV_GENTL_XOF_DEVICE, ref m_stDeviceList); if (0 != nRet) { - ShowErrorMsg("Enumerate devices fail!",0); + ShowErrorMsg("Enumerate devices fail!", 0); return; } @@ -195,7 +195,7 @@ namespace BasicDemo if (device.nTLayerType == MyCamera.MV_GIGE_DEVICE) { MyCamera.MV_GIGE_DEVICE_INFO_EX gigeInfo = (MyCamera.MV_GIGE_DEVICE_INFO_EX)MyCamera.ByteToStruct(device.SpecialInfo.stGigEInfo, typeof(MyCamera.MV_GIGE_DEVICE_INFO_EX)); - + if ((gigeInfo.chUserDefinedName.Length > 0) && (gigeInfo.chUserDefinedName[0] != '\0')) { if (MyCamera.IsTextUTF8(gigeInfo.chUserDefinedName)) @@ -335,7 +335,7 @@ namespace BasicDemo } // ch:获取选择的设备信息 | en:Get selected device information - MyCamera.MV_CC_DEVICE_INFO device = + MyCamera.MV_CC_DEVICE_INFO device = (MyCamera.MV_CC_DEVICE_INFO)Marshal.PtrToStructure(m_stDeviceList.pDeviceInfo[cbDeviceList.SelectedIndex], typeof(MyCamera.MV_CC_DEVICE_INFO)); @@ -436,7 +436,7 @@ namespace BasicDemo m_MyCamera.MV_CC_CloseDevice_NET(); m_MyCamera.MV_CC_DestroyDevice_NET(); } - + // ch:控件操作 | en:Control Operation SetCtrlWhenClose(); } @@ -484,7 +484,7 @@ namespace BasicDemo { bnStartGrab.Enabled = false; bnStopGrab.Enabled = true; - + if (bnTriggerMode.Checked && cbSoftTrigger.Checked) { bnTriggerExec.Enabled = true; @@ -707,7 +707,7 @@ namespace BasicDemo m_stFrameInfo.nFrameLen = 0;//取流之前先清除帧长度 m_stFrameInfo.enPixelType = MyCamera.MvGvspPixelType.PixelType_Gvsp_Undefined; - + m_hReceiveThread = new Thread(ReceiveThreadProcess); m_hReceiveThread.Start(); @@ -777,7 +777,7 @@ namespace BasicDemo int nRet = m_MyCamera.MV_CC_StopGrabbing_NET(); if (nRet != MyCamera.MV_OK) { - ShowErrorMsg("Stop Grabbing Fail!" , nRet); + ShowErrorMsg("Stop Grabbing Fail!", nRet); } // ch:控件操作 | en:Control Operation @@ -816,7 +816,7 @@ namespace BasicDemo return; } } - + ShowErrorMsg("Save Succeed!", 0); } @@ -994,5 +994,10 @@ namespace BasicDemo // ch: 反初始化SDK | en: Finalize SDK MyCamera.MV_CC_Finalize_NET(); } + + private void button1_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.resx b/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.resx index 0184401..c9bc88d 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.resx +++ b/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 142, 26 + + + 921, 549 - + 4 @@ -129,37 +129,31 @@ bnSaveTiff - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 921, 549 + + groupBox4 - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 87, 23 + + cbDeviceList + 666, 272 - - False - bnEnum Exposure Time - - $this - - - 2 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 False @@ -170,50 +164,44 @@ False - - True - - - groupBox2 - - - groupBox3 + + 666, 364 4 - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 bnTriggerMode - - 20, 20 + + bnStartGrab Trigger Once - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + 1 0 - - 137, 95 + + 632, 483 groupBox4 - - 150, 99 + + False - - 1 + + 2 0 @@ -224,15 +212,15 @@ 0 - - 92, 23 - 1 138, 16 + + 83, 23 + 142, 69 @@ -242,14 +230,14 @@ 1 + + bnSaveBmp + - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 142, 20 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox2 @@ -257,26 +245,23 @@ 20, 57 - - 20, 69 - - + $this + + groupBox3 + True - - $this + + False Trigger Mode - - System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox4 @@ -284,8 +269,8 @@ groupBox3 - - 5 + + groupBox3 False @@ -296,21 +281,12 @@ Form1 - - Picture Storage - 5 groupBox4 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - False @@ -320,29 +296,20 @@ 95, 23 - - bnSetParam - - - groupBox4 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 False - - bnStartGrab + + 142, 20 Save as BMP - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 20, 98 @@ -356,6 +323,9 @@ 85, 23 + + bnOpen + 100, 21 @@ -368,8 +338,11 @@ 142, 57 + + tbExposure + - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 83, 12 @@ -380,20 +353,26 @@ label3 + + 83, 16 + label2 - - Save as JPG + + groupBox3 - - 3 + + groupBox2 + + + False groupBox2 - - tbExposure + + Initialization tbGain @@ -401,17 +380,14 @@ Close Device - - True - $this - - 137, 59 + + Trigger by Software - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 5 @@ -428,9 +404,6 @@ 92, 23 - - 137, 137 - Get Parameter @@ -438,19 +411,19 @@ 93, 23 - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Continuous - + + 5 + + groupBox3 - - 95, 16 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Image Acquisition @@ -471,34 +444,49 @@ 5 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Parameters 632, 20 - - Save as PNG + + 137, 59 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 95, 16 5 + + 3 + 2 - - 666, 12 + + Save as PNG - - 2 + + 3 + + + 100, 21 1 - - 3 + + 0 - - 632, 483 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -521,9 +509,6 @@ 88, 23 - - 2 - 4 @@ -531,7 +516,10 @@ Stop - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 pictureBox1 @@ -542,6 +530,9 @@ bnTriggerExec + + 29, 12 + False @@ -549,13 +540,13 @@ 18, 137 - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 100, 21 + + 20, 69 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Picture Storage groupBox2 @@ -563,11 +554,11 @@ bnContinuesMode - - 83, 16 + + groupBox4 - - 29, 12 + + True 1 @@ -575,18 +566,17 @@ 7 - - 3 + + bnSetParam 1 - - 666, 364 + + 142, 26 - - - 4, 4, 4, 4 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 95, 23 @@ -597,8 +587,8 @@ 142, 62 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 137, 25 @@ -606,35 +596,36 @@ 20, 26 - - False + + groupBox1 - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 95, 23 + + + 4, 4, 4, 4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 92, 23 - - Parameters + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True - - 2 + + True - - 5 + + 137, 137 Set Parameter - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 150, 99 666, 128 @@ -645,11 +636,8 @@ 3 - - Initialization - - - False + + Save as JPG bnSaveJpg @@ -660,38 +648,41 @@ 3 - - 3 + + $this + + + True bnGetParam - - 20, 62 + + 137, 95 groupBox1 - - groupBox4 - groupBox1 + + 3 + 6 groupBox1 - - bnOpen + + $this False - - True + + 20, 20 Gain @@ -699,6 +690,9 @@ $this + + button1 + True @@ -720,6 +714,9 @@ 0 + + 95, 23 + 65, 12 @@ -735,11 +732,17 @@ tbFrameRate + + 20, 62 + + + 2 + 2 - - bnSaveBmp + + 2 6, 103 @@ -750,8 +753,8 @@ False - - cbDeviceList + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3 @@ -762,8 +765,8 @@ 4 - - groupBox3 + + 6 17, 12 @@ -774,11 +777,14 @@ False - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - cbSoftTrigger + + 1239, 40 + + + groupBox2 243, 134 @@ -786,12 +792,21 @@ groupBox2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 210, 23 1 + + 666, 12 + + + cbSoftTrigger + 20, 20 @@ -804,37 +819,40 @@ 0 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 20, 62 - - Trigger by Software - label1 - - 0 + + 2 - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 83, 23 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 bnClose - + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - + zh-CHS \ No newline at end of file diff --git a/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.zh-CHS.resx b/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.zh-CHS.resx index a12c2e4..2ec8587 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.zh-CHS.resx +++ b/外科辅料和患者防护罩激光抗性测试仪/BasicDemo/BasicDemo.zh-CHS.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 23, 15 - + 4, 4, 4, 4 @@ -138,7 +138,7 @@ 843, 604 - 189, 86 + 189, 64 4, 4, 4, 4 @@ -150,7 +150,7 @@ 关闭设备 - 27, 86 + 27, 64 4, 4, 4, 4 @@ -188,6 +188,21 @@ 初始化 + + 888, 160 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 + + + 324, 168 + + + 采集图像 + 189, 124 @@ -260,22 +275,22 @@ 连续模式 - - 888, 160 + + 888, 340 - + 4, 4, 4, 4 - + 4, 4, 4, 4 - - 324, 168 + + 324, 121 - - 采集图像 + + 保存图片 - + False @@ -336,20 +351,20 @@ 保存BMP - - 888, 340 + + 888, 469 - + 4, 4, 4, 4 - + 4, 4, 4, 4 - - 324, 121 + + 324, 196 - - 保存图片 + + 参数 189, 152 @@ -438,30 +453,12 @@ 123, 25 - - 888, 469 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 - - - 324, 196 - - - 参数 - 8, 15 1882, 953 - - 4, 4, 4, 4 - MvCamera SDK CS演示程序 diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ParameterSetting.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ParameterSetting.cs index be25bab..9657d1c 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ParameterSetting.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ParameterSetting.cs @@ -519,7 +519,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private void uiLabel14_Click(object sender, EventArgs e) { - SwitchToForm(); + //SwitchToForm(); + + + Form1 form1 = new Form1(); + form1.ShowDialog(); } private void uiLabel1_Click(object sender, EventArgs e)