Changeset 437 in flair-src for trunk/tools/FlairGCS/src/Layout.cpp
- Timestamp:
- 08/24/21 17:33:19 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tools/FlairGCS/src/Layout.cpp
r269 r437 127 127 double max = dom->attribute("max").toDouble(); 128 128 double step = dom->attribute("step").toDouble(); 129 int decimals = dom->attribute("decimals").toInt();129 uint16_t decimals = dom->attribute("decimals").toUShort(); 130 130 widget = new DoubleSpinBox(this, row, col, name, suffix, value, min, max, 131 131 step, decimals); … … 139 139 double max = dom->attribute("max").toDouble(); 140 140 double step = dom->attribute("step").toDouble(); 141 int decimals = dom->attribute("decimals").toInt();141 uint16_t decimals = dom->attribute("decimals").toUShort(); 142 142 widget = new Vector3DSpinBox(this, row, col, name, value, min, max, step, 143 143 decimals); … … 148 148 } 149 149 if (type == "ComboBox") { 150 int value = dom->attribute("value").toInt();150 uint16_t value = dom->attribute("value").toUShort(); 151 151 widget = new ComboBox(this, row, col, name, value); 152 152 } … … 158 158 float ymax = dom->attribute("max").toFloat(); 159 159 int enabled = dom->attribute("enabled").toInt(); 160 int period = dom->attribute("period").toInt(); 161 if (enabled == 1) { 162 widget = new DataPlot1D(this, row, col, name, ymin, ymax, true, period); 163 } else { 164 widget = new DataPlot1D(this, row, col, name, ymin, ymax, false, 100); 160 uint16_t period = dom->attribute("period").toUShort(); 161 uint16_t nb_buffering = dom->attribute("nb_buf").toUShort(); 162 if (enabled == 1) { 163 widget = new DataPlot1D(this, row, col, name, ymin, ymax, true, period,nb_buffering); 164 } else { 165 widget = new DataPlot1D(this, row, col, name, ymin, ymax, false, 100,nb_buffering); 165 166 } 166 167 } … … 173 174 QString y_name = dom->attribute("y_name"); 174 175 int enabled = dom->attribute("enabled").toInt(); 175 int period = dom->attribute("period").toInt(); 176 uint16_t period = dom->attribute("period").toUShort(); 177 uint16_t nb_buffering = dom->attribute("nb_buf").toUShort(); 176 178 if (enabled == 1) { 177 179 widget = new DataPlot2D(this, row, col, name, x_name, y_name, xmin, xmax, 178 ymin, ymax, true, period );180 ymin, ymax, true, period,nb_buffering); 179 181 } else { 180 182 widget = new DataPlot2D(this, row, col, name, x_name, y_name, xmin, xmax, 181 ymin, ymax, false, 100 );183 ymin, ymax, false, 100,nb_buffering); 182 184 } 183 185 } … … 187 189 QString y_name = dom->attribute("y_name"); 188 190 int enabled = dom->attribute("enabled").toInt(); 189 int period = dom->attribute("period").toInt();191 uint16_t period = dom->attribute("period").toUShort(); 190 192 QString type = dom->attribute("type"); 191 193 int samples = dom->attribute("samples").toInt(); … … 210 212 uint32_t nb_samples = dom->attribute("nb_samples").toUInt(); 211 213 int enabled = dom->attribute("enabled").toInt(); 212 int period = dom->attribute("period").toInt();214 uint16_t period = dom->attribute("period").toUShort(); 213 215 int invert_axis = dom->attribute("invert_axis").toInt(); 214 216 bool invert_axis_bool; … … 234 236 int height = dom->attribute("height").toInt(); 235 237 int enabled = dom->attribute("enabled").toInt(); 236 int period = dom->attribute("period").toInt();238 uint16_t period = dom->attribute("period").toUShort(); 237 239 if (enabled == 1) { 238 240 widget = new Picture(this, row, col, name, width, height, true, period); … … 242 244 } 243 245 if (type == "Map") { 244 int period = dom->attribute("period").toInt();246 uint16_t period = dom->attribute("period").toUShort(); 245 247 int enabled = dom->attribute("enabled").toInt(); 246 248 int i = 0;
Note:
See TracChangeset
for help on using the changeset viewer.