Rev 158 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 158 | Rev 162 | ||
---|---|---|---|
Line 88... | Line 88... | ||
88 | cb_Log[30] = cb_Log_30; |
88 | cb_Log[30] = cb_Log_30; |
89 | cb_Log[31] = cb_Log_31; |
89 | cb_Log[31] = cb_Log_31; |
Line 90... | Line 90... | ||
90 | 90 | ||
Line 91... | Line 91... | ||
91 | } |
91 | } |
92 | 92 | ||
93 | void dlg_Config::set_Settings(cSettings *Set) |
93 | void dlg_Config::set_Settings(cSettings *Set, int ID) |
Line -... | Line 94... | ||
- | 94 | { |
|
- | 95 | Settings = Set; |
|
94 | { |
96 | |
95 | Settings = Set; |
97 | lb_Hardware->setText(HardwareType[ID]); |
96 | 98 | ||
97 | for (int a = 0; a < MaxAnalog; a++) |
99 | for (int a = 0; a < MaxAnalog; a++) |
98 | { |
100 | { |
99 | cb_Plot[a]->setText(Settings->Analog[a].Name); |
101 | cb_Plot[a]->setText(Settings->Analog1.Label[a]); |
100 | cb_Plot[a]->setChecked(Settings->Analog[a].Plot); |
102 | cb_Plot[a]->setChecked(Settings->Analog1.PlotView[a]); |
101 | cb_Log[a]->setText(Settings->Analog[a].Name); |
103 | cb_Log[a]->setText(Settings->Analog1.Label[a]); |
Line 102... | Line 104... | ||
102 | cb_Log[a]->setChecked(Settings->Analog[a].Log); |
104 | cb_Log[a]->setChecked(Settings->Analog1.LogView[a]); |
103 | } |
105 | } |
104 | } |
106 | } |
105 | 107 | ||
106 | cSettings *dlg_Config::get_Settings() |
108 | cSettings *dlg_Config::get_Settings() |
107 | { |
109 | { |
Line 108... | Line 110... | ||
108 | for (int a = 0; a < MaxAnalog; a++) |
110 | for (int a = 0; a < MaxAnalog; a++) |
109 | { |
111 | { |
110 | Settings->Analog[a].Plot = cb_Plot[a]->isChecked(); |
112 | Settings->Analog1.PlotView.setBit(a,cb_Plot[a]->isChecked()); |
111 | } |
113 | } |
Line 112... | Line 114... | ||
112 | 114 | ||
113 | for (int a = 0; a < MaxAnalog; a++) |
115 | for (int a = 0; a < MaxAnalog; a++) |