Commit 7339860c authored by meier_b's avatar meier_b
Browse files

New adapter with linear voltage regulators

parent 9e2617f7
......@@ -6,11 +6,11 @@ class R4sImg
{
int *data;
int *dataSum; // sum of images
int nImgs = 1; // number of images averaged
int nImgs; // number of images averaged
std::vector<int> dataNEW;
public:
R4sImg() : data(0) {}
R4sImg() : data(0), dataSum(0), nImgs(1) {}
bool CreateRaw(const vector<uint16_t> &rawdata);
void Clear() { if (data) delete[] data; data = 0; }//dataNEW.clear();}
void Save(const string &filename);
......
......@@ -520,7 +520,7 @@ CMD_PROC(dopen)
int buffersize;
PAR_INT(buffersize, 0, 60000000);
buffersize = tb.Daq_Open(buffersize);
printf("%i words allocated for data buffer %i\n", buffersize);
printf("%i words allocated for data buffer\n", buffersize);
if (buffersize == 0) printf("error\n");
}
......@@ -627,6 +627,22 @@ CMD_PROC(running)
if (running) printf("true\n"); else printf("false\n");
}
CMD_PROC(vdig)
{
int mV;
PAR_INT(mV, 0, 2500)
tb.r4s_SetVdig(mV);
DO_FLUSH
}
CMD_PROC(vana)
{
int mV;
PAR_INT(mV, 0, 2500)
tb.r4s_SetVana(mV);
DO_FLUSH
}
CMD_PROC(vcal)
{
int mV;
......@@ -674,11 +690,3 @@ CMD_PROC(vaux2)
tb.r4s_SetVaux2(mV);
DO_FLUSH
}
CMD_PROC(vaux3)
{
int mV;
PAR_INT(mV, 0, 2500)
tb.r4s_SetVaux3(mV);
DO_FLUSH
}
......@@ -105,10 +105,11 @@ CMD_REG(go, "", "Start ROC4sens measurement sequence")
CMD_REG(goloop, "", "Start readout loop. Stop by pressing any key")
CMD_REG(running, "", "Check if measurement sequence running")
CMD_REG(vdig, "<mV>", "Set Roc4sens Vdig")
CMD_REG(vana, "<mV>", "Set Roc4sens Vana")
CMD_REG(vcal, "<mV>", "Set Roc4sens Vcal")
CMD_REG(rgpr, "<mV>", "Set Roc4sens RgPr")
CMD_REG(rgsh, "<mV>", "Set Roc4sens RgSh")
CMD_REG(vref, "<mV>", "Set Roc4sens Vref")
CMD_REG(vaux1, "<mV>", "Set Roc4sens Vaux1")
CMD_REG(vaux2, "<mV>", "Set Roc4sens Vaux2")
CMD_REG(vaux3, "<mV>", "Set Roc4sens Vaux3")
......@@ -25,9 +25,9 @@ void CDataLink::PutCmdHeader(uint16_t cmd)
// =======================================================
/*
0: SetExit();
1: SetVD(ushort mV)
1: SetVdig(ushort mV)
2: GetID()
3: SetVA(ushort mV)
3: SetVana(ushort mV)
4: GetIA()
20: SetVcal(uint16_t mV)
21: SetRgsh(uint16_t mV)
......@@ -36,9 +36,8 @@ void CDataLink::PutCmdHeader(uint16_t cmd)
24: r4s_SetPixCal(uint8_t x, uint8_t y)
25: r4s_SetHoldPos(uint8_t t)
26: r4s_AdcDelay(uint8_t t)
30: SetVaux(uint16_t mV)
31: SetVaux(uint16_t mV)
32: SetVaux(uint16_t mV)
30: SetVaux1(uint16_t mV)
31: SetVaux2(uint16_t mV)
33: SetCal(uint8_t x, uint8_t y);
34: r4s_SetSeqReadout();
35: r4s_SetSeqCalScan();
......@@ -51,10 +50,10 @@ void CDataLink::PutCmdHeader(uint16_t cmd)
1100: {byte width, byte height, short[] rawImg} ret GetImage()
*/
void CDataLink::Exec_SetVD()
void CDataLink::Exec_SetVdig()
{
uint16_t value = Get_uint16();
tb._SetVD(value);
tb.r4s_SetVdig(value);
tb.Flush();
}
......@@ -74,10 +73,10 @@ void CDataLink::Exec_GetID()
tb.Flush();
}
void CDataLink::Exec_SetVA()
void CDataLink::Exec_SetVana()
{
uint16_t value = Get_uint16();
tb._SetVA(value);
tb.r4s_SetVana(value);
tb.Flush();
}
......@@ -131,12 +130,6 @@ void CDataLink::Exec_SetVaux2()
tb.Flush();
}
void CDataLink::Exec_SetVaux3()
{
uint16_t value = Get_uint16();
tb.r4s_SetVaux3(value);
tb.Flush();
}
void CDataLink::Exec_r4s_SetPixCal()
{
......@@ -221,9 +214,9 @@ void CDataLink::Run()
switch (cmd)
{
case 0: running = false; break;
case 1: Exec_SetVD(); break;
case 1: Exec_SetVdig(); break;
case 2: Exec_GetID(); break;
case 3: Exec_SetVA(); break;
case 3: Exec_SetVana(); break;
case 4: Exec_GetIA(); break;
case 20: Exec_SetVcal(); break;
case 21: Exec_SetRgsh(); break;
......@@ -234,7 +227,6 @@ void CDataLink::Run()
case 26: Exec_r4s_AdcDelay(); break;
case 30: Exec_SetVaux1(); break;
case 31: Exec_SetVaux2(); break;
case 32: Exec_SetVaux3(); break;
case 33: Exec_SetCal(); break;
case 34: Exec_r4s_SetSeqReadout(); break;
case 35: Exec_r4s_SetSeqCalScan(); break;
......
......@@ -15,9 +15,9 @@ class CDataLink : public CPipeServerInOut
void Exec_SetExit();
void Exec_SetCal();
void Exec_SetVD();
void Exec_SetVana();
void Exec_GetID();
void Exec_SetVA();
void Exec_SetVdig();
void Exec_GetIA();
void Exec_SetVcal();
void Exec_SetRgsh();
......@@ -25,7 +25,6 @@ class CDataLink : public CPipeServerInOut
void Exec_SetVref();
void Exec_SetVaux1();
void Exec_SetVaux2();
void Exec_SetVaux3();
void Exec_r4s_SetPixCal();
void Exec_r4s_SetHoldPos();
void Exec_r4s_AdcDelay();
......
......@@ -260,12 +260,13 @@ public:
RPC_EXPORT bool r4s_Running();
RPC_EXPORT void r4s_SetVdig(uint16_t mV);
RPC_EXPORT void r4s_SetVana(uint16_t mV);
RPC_EXPORT void r4s_SetVcal(uint16_t mV);
RPC_EXPORT void r4s_SetRgsh(uint16_t mV);
RPC_EXPORT void r4s_SetRgpr(uint16_t mV);
RPC_EXPORT void r4s_SetVref(uint16_t mV);
RPC_EXPORT void r4s_SetVaux1(uint16_t mV);
RPC_EXPORT void r4s_SetVaux2(uint16_t mV);
RPC_EXPORT void r4s_SetVaux3(uint16_t mV);
};
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "r4stest", "r4stest.vcxproj", "{7874394C-3216-5E75-AEA4-B33FCB3AD88D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "r4stest", "r4stest.vcxproj", "{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "roc4sens_view", "roc4sens_view\roc4sens_view.csproj", "{92C1DFC0-1475-48B8-82F0-1679A469A36C}"
EndProject
......@@ -14,16 +14,16 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Debug|Win32.ActiveCfg = Debug|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Debug|Win32.Build.0 = Debug|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Debug|x86.ActiveCfg = Debug|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Release|Mixed Platforms.Build.0 = Release|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Release|Win32.ActiveCfg = Release|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Release|Win32.Build.0 = Release|Win32
{7874394C-3216-5E75-AEA4-B33FCB3AD88D}.Release|x86.ActiveCfg = Release|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Debug|Win32.ActiveCfg = Debug|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Debug|Win32.Build.0 = Debug|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Debug|x86.ActiveCfg = Debug|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Release|Mixed Platforms.Build.0 = Release|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Release|Win32.ActiveCfg = Release|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Release|Win32.Build.0 = Release|Win32
{BCB36158-B3D9-95B9-64FC-2A64BBE1B2DB}.Release|x86.ActiveCfg = Release|Win32
{92C1DFC0-1475-48B8-82F0-1679A469A36C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{92C1DFC0-1475-48B8-82F0-1679A469A36C}.Debug|Mixed Platforms.Build.0 = Debug|x86
{92C1DFC0-1475-48B8-82F0-1679A469A36C}.Debug|Win32.ActiveCfg = Debug|x86
......
......@@ -34,30 +34,30 @@
<GroupBox Grid.Column="2" Header="ROC4sens control" HorizontalAlignment="Left" Name="groupBox1" VerticalAlignment="Top" Width="auto " Grid.ColumnSpan="2" Margin="5,0,0,0">
<StackPanel Orientation="Horizontal">
<GroupBox Header="VD" Height="204" Width="62">
<GroupBox Header="Vdig" Height="204" Width="62">
<DockPanel>
<DockPanel Height="auto" DockPanel.Dock="Top" Margin="0,0,0,1">
<TextBox Name="txtVD" Text="{Binding Path=VD, UpdateSourceTrigger=LostFocus, Mode=TwoWay, Converter={StaticResource D2S}}" Width="39" DockPanel.Dock="Left" Background="#FFF2D6D6" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Padding="0" />
<TextBox Name="txtVdig" Text="{Binding Path=Vdig, UpdateSourceTrigger=LostFocus, Mode=TwoWay, Converter={StaticResource D2S}}" Width="39" DockPanel.Dock="Left" Background="#FFF2D6D6" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Padding="0" />
<Label Padding="2,0,0,0" VerticalContentAlignment="Center">V</Label>
</DockPanel>
<DockPanel Height="auto" DockPanel.Dock="Top" Margin="0,0,0,1">
<Label Name="txtID" Content="{Binding Path=ID, Converter={StaticResource D2S}}" Width="29" DockPanel.Dock="Left" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Padding="0" />
<Label Padding="2,0,0,0" VerticalContentAlignment="Center">mA</Label>
</DockPanel>
<Slider Name="sldVD" Value="{Binding Path=VD, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Orientation="Vertical" Width="28" Maximum="3" SmallChange="0.001" TickFrequency="0.1" LargeChange="0.01" TickPlacement="TopLeft" />
<Slider Name="sldVdig" Value="{Binding Path=Vdig, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Orientation="Vertical" Width="28" Maximum="3" SmallChange="0.001" TickFrequency="0.1" LargeChange="0.01" TickPlacement="TopLeft" />
</DockPanel>
</GroupBox>
<GroupBox Header="VA" Height="204" Width="62">
<GroupBox Header="Vana" Height="204" Width="62">
<DockPanel>
<DockPanel Height="auto" DockPanel.Dock="Top" Margin="0,0,0,1">
<TextBox Name="txtVA" Text="{Binding Path=VA, UpdateSourceTrigger=LostFocus, Mode=TwoWay, Converter={StaticResource D2S}}" Width="39" DockPanel.Dock="Left" Background="#FFF2D6D6" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Padding="0" />
<TextBox Name="txtVA" Text="{Binding Path=Vana, UpdateSourceTrigger=LostFocus, Mode=TwoWay, Converter={StaticResource D2S}}" Width="39" DockPanel.Dock="Left" Background="#FFF2D6D6" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Padding="0" />
<Label Padding="2,0,0,0" VerticalContentAlignment="Center">V</Label>
</DockPanel>
<DockPanel Height="auto" DockPanel.Dock="Top" Margin="0,0,0,1">
<Label Name="txtIA" Content="{Binding Path=IA, Converter={StaticResource D2S}}" Width="29" DockPanel.Dock="Left" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Padding="0" />
<Label Padding="2,0,0,0" VerticalContentAlignment="Center">mA</Label>
</DockPanel>
<Slider Name="sldVA" Value="{Binding Path=VA, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Orientation="Vertical" Width="28" Maximum="3" SmallChange="0.001" TickFrequency="0.1" LargeChange="0.01" TickPlacement="TopLeft" />
<Slider Name="sldVana" Value="{Binding Path=Vana, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Orientation="Vertical" Width="28" Maximum="3" SmallChange="0.001" TickFrequency="0.1" LargeChange="0.01" TickPlacement="TopLeft" />
</DockPanel>
</GroupBox>
<GroupBox Header="Vcal" Height="204" HorizontalAlignment="Left" Width="62">
......
......@@ -148,10 +148,10 @@ public partial class MainWindow : Window, INotifyPropertyChanged
private bool _CalX_changed = true;
private int _CalY = 0;
private bool _CalY_changed = true;
private double _VD = 2.2;
private bool _VD_changed = true;
private double _VA = 2.0;
private bool _VA_changed = true;
private double _Vdig = 2.2;
private bool _Vdig_changed = true;
private double _Vana = 2.0;
private bool _Vana_changed = true;
private double _Vcal = 0.9;
private bool _Vcal_changed = true;
private double _Voffs = 0.25;
......@@ -167,8 +167,8 @@ public partial class MainWindow : Window, INotifyPropertyChanged
public int CalX { get { return _CalX; } set { _CalX = value; _CalX_changed = true; Notify("CalX"); } }
public int CalY { get { return _CalY; } set { _CalY = value; _CalY_changed = true; Notify("CalY"); } }
public double VD { get { return _VD; } set { _VD = value; _VD_changed = true; Notify("VD"); } }
public double VA { get { return _VA; } set { _VA = value; _VA_changed = true; Notify("VA"); } }
public double Vdig { get { return _Vdig; } set { _Vdig = value; _Vdig_changed = true; Notify("Vdig"); } }
public double Vana { get { return _Vana; } set { _Vana = value; _Vana_changed = true; Notify("Vana"); } }
public double Vcal { get { return _Vcal; } set { _Vcal = value; _Vcal_changed = true; Notify("Vcal"); } }
public double Voffs { get { return _Voffs; } set { _Voffs = value; _Voffs_changed = true; Notify("Voffs"); } }
public double Vrgpr { get { return _Vrgpr; } set { _Vrgpr = value; _Vrgpr_changed = true; Notify("Vrgpr"); } }
......@@ -189,8 +189,8 @@ public partial class MainWindow : Window, INotifyPropertyChanged
pipe.GetIA();
if (_CalX_changed) { pipe.SetCal((byte)_CalX, (byte)_CalY); _CalX_changed = _CalY_changed = false; }
if (_CalY_changed) { pipe.SetCal((byte)_CalX, (byte)_CalY); _CalY_changed = _CalY_changed = false; }
if (_VD_changed) { pipe.SetVD((ushort)(_VD * 1000)); _VD_changed = false; }
if (_VA_changed) { pipe.SetVA((ushort)(_VA * 1000)); _VA_changed = false; }
if (_Vdig_changed) { pipe.SetVdig((ushort)(_Vdig * 1000)); _Vdig_changed = false; }
if (_Vana_changed) { pipe.SetVana((ushort)(_Vana * 1000)); _Vana_changed = false; }
if (_Vcal_changed) { pipe.SetVcal((ushort)(_Vcal * 1000)); _Vcal_changed = false; }
if (_Voffs_changed) { pipe.SetVref((ushort)(_Voffs * 1000)); _Voffs_changed = false; }
if (_Vrgpr_changed) { pipe.SetRgpr((ushort)(_Vrgpr * 1000)); _Vrgpr_changed = false; }
......
......@@ -56,7 +56,6 @@ class AppClient
26: r4s_AdcDelay(uint8_t t)
30: SetVaux(uint16_t mV)
31: SetVaux(uint16_t mV)
32: SetVaux(uint16_t mV)
33: SetCal(uint8_t x, uint8_t y);
34: r4s_SetSeqReadout();
35: r4s_SetSeqCalScan();
......@@ -98,7 +97,7 @@ class AppClient
pipeOut.Flush();
}
public void SetVD(ushort value)
public void SetVdig(ushort value)
{
PutCmdHeader(1);
pipeOut.Put_uint16(value);
......@@ -111,7 +110,7 @@ class AppClient
pipeOut.Flush();
}
public void SetVA(ushort value)
public void SetVana(ushort value)
{
PutCmdHeader(3);
pipeOut.Put_uint16(value);
......@@ -166,13 +165,6 @@ class AppClient
pipeOut.Flush();
}
public void SetVaux3(ushort value)
{
PutCmdHeader(32);
pipeOut.Put_uint16(value);
pipeOut.Flush();
}
public void r4s_SetPixCal(byte x, byte y)
{
PutCmdHeader(24);
......
#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1F1E97B9D1AF1ECAC1F03A77299F6513"
#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "49B27F96D975073E32EC0A4AD7DB67CF"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
......@@ -92,7 +92,7 @@ namespace roc4sens_view {
#line 40 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox txtVD;
internal System.Windows.Controls.TextBox txtVdig;
#line default
#line hidden
......@@ -108,7 +108,7 @@ namespace roc4sens_view {
#line 47 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Slider sldVD;
internal System.Windows.Controls.Slider sldVdig;
#line default
#line hidden
......@@ -132,7 +132,7 @@ namespace roc4sens_view {
#line 60 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Slider sldVA;
internal System.Windows.Controls.Slider sldVana;
#line default
#line hidden
......@@ -226,9 +226,9 @@ namespace roc4sens_view {
#line hidden
#line 110 "..\..\..\MainWindow.xaml"
#line 108 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox txtHoldPos;
internal System.Windows.Controls.CheckBox cbCalScan;
#line default
#line hidden
......@@ -236,13 +236,21 @@ namespace roc4sens_view {
#line 111 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox txtHoldPos;
#line default
#line hidden
#line 112 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Slider sldHoldPos;
#line default
#line hidden
#line 116 "..\..\..\MainWindow.xaml"
#line 117 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox txtCalX;
......@@ -250,7 +258,7 @@ namespace roc4sens_view {
#line hidden
#line 117 "..\..\..\MainWindow.xaml"
#line 118 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Slider sldCalX;
......@@ -258,7 +266,7 @@ namespace roc4sens_view {
#line hidden
#line 122 "..\..\..\MainWindow.xaml"
#line 123 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox txtCalY;
......@@ -266,7 +274,7 @@ namespace roc4sens_view {
#line hidden
#line 123 "..\..\..\MainWindow.xaml"
#line 124 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Slider sldCalY;
......@@ -274,7 +282,7 @@ namespace roc4sens_view {
#line hidden
#line 133 "..\..\..\MainWindow.xaml"
#line 134 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.GroupBox groupBox8;
......@@ -282,7 +290,7 @@ namespace roc4sens_view {
#line hidden
#line 136 "..\..\..\MainWindow.xaml"
#line 137 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Slider sldAverage;
......@@ -290,7 +298,7 @@ namespace roc4sens_view {
#line hidden
#line 137 "..\..\..\MainWindow.xaml"
#line 138 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label txtAvgCount;
......@@ -298,7 +306,7 @@ namespace roc4sens_view {
#line hidden
#line 138 "..\..\..\MainWindow.xaml"
#line 139 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnReset;
......@@ -306,7 +314,7 @@ namespace roc4sens_view {
#line hidden
#line 139 "..\..\..\MainWindow.xaml"
#line 140 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnSetDark;
......@@ -314,7 +322,7 @@ namespace roc4sens_view {
#line hidden
#line 140 "..\..\..\MainWindow.xaml"
#line 141 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnSave;
......@@ -322,7 +330,7 @@ namespace roc4sens_view {
#line hidden
#line 141 "..\..\..\MainWindow.xaml"
#line 142 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label calPixel;
......@@ -330,7 +338,7 @@ namespace roc4sens_view {
#line hidden
#line 142 "..\..\..\MainWindow.xaml"
#line 143 "..\..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label calPixelValue;
......@@ -392,13 +400,13 @@ namespace roc4sens_view {
this.groupBox1 = ((System.Windows.Controls.GroupBox)(target));
return;
case 7:
this.txtVD = ((System.Windows.Controls.TextBox)(target));
this.txtVdig = ((System.Windows.Controls.TextBox)(target));
return;
case 8:
this.txtID = ((System.Windows.Controls.Label)(target));
return;
case 9:
this.sldVD = ((System.Windows.Controls.Slider)(target));
this.sldVdig = ((System.Windows.Controls.Slider)(target));
return;
case 10:
this.txtVA = ((System.Windows.Controls.TextBox)(target));
......@@ -407,7 +415,7 @@ namespace roc4sens_view {
this.txtIA = ((System.Windows.Controls.Label)(target));
return;
case 12:
this.sldVA = ((System.Windows.Controls.Slider)(target));
this.sldVana = ((System.Windows.Controls.Slider)(target));
return;
case 13:
this.txtVcal = ((System.Windows.Controls.TextBox)(target));
......@@ -455,75 +463,90 @@ namespace roc4sens_view {
#line hidden
return;
case 24:
this.txtHoldPos = ((System.Windows.Controls.TextBox)(target));
this.cbCalScan = ((System.Windows.Controls.CheckBox)(target));
#line 108 "..\..\..\MainWindow.xaml"
this.cbCalScan.Checked += new System.Windows.RoutedEventHandler(this.CalScan_On);
#line default
#line hidden
#line 108 "..\..\..\MainWindow.xaml"
this.cbCalScan.Unchecked += new System.Windows.RoutedEventHandler(this.CalScan_Off);
#line default
#line hidden
return;
case 25:
this.sldHoldPos = ((System.Windows.Controls.Slider)(target));
this.txtHoldPos = ((System.Windows.Controls.TextBox)(target));
return;
case 26:
this.txtCalX = ((System.Windows.Controls.TextBox)(target));
this.sldHoldPos = ((System.Windows.Controls.Slider)(target));
return;
case 27:
this.txtCalX = ((System.Windows.Controls.TextBox)(target));
return;
case 28:
this.sldCalX = ((System.Windows.Controls.Slider)(target));
#line 117 "..\..\..\MainWindow.xaml"
#line 118 "..\..\..\MainWindow.xaml"
this.sldCalX.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.Cal_ValueChanged);
#line default
#line hidden
return;
case 28:
case 29:
this.txtCalY = ((System.Windows.Controls.TextBox)(target));
return;
case 29:
case 30:
this.sldCalY = ((System.Windows.Controls.Slider)(target));
#line 123 "..\..\..\MainWindow.xaml"
#line 124 "..\..\..\MainWindow.xaml"
this.sldCalY.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.Cal_ValueChanged);
#line default
#line hidden
return;
case 30:
case 31:
this.groupBox8 = ((System.Windows.Controls.GroupBox)(target));
return;
case 31:
case 32:
this.sldAverage = ((System.Windows.Controls.Slider)(target));
return;
case 32:
case 33:
this.txtAvgCount = ((System.Windows.Controls.Label)(target));
return;
case 33:
case 34:
this.btnReset = ((System.Windows.Controls.Button)(target));
#line 138 "..\..\..\MainWindow.xaml"