Browse Source

Maybe fixes bizarre issue that only manifests on builds at random related to NI DAQmx.

Neal Wilson 9 years ago
parent
commit
160663e195
2 changed files with 312 additions and 311 deletions
  1. 310
    310
      src/typica.cpp
  2. 2
    1
      src/typica.w

+ 310
- 310
src/typica.cpp
File diff suppressed because it is too large
View File


+ 2
- 1
src/typica.w View File

@@ -6598,7 +6598,8 @@ void DAQImplementation::measure()@t\2@>@/
6598 6598
             {
6599 6599
                 for(int j = 0; j < channels; j++)@/
6600 6600
                 {
6601
-                    Measurement measure(buffer[@,j+(i*channels)], time,
6601
+					double measuredValue = buffer[j+(i*channels)];
6602
+                    Measurement measure(measuredValue, time,
6602 6603
                                         unitMap[j]);
6603 6604
                     channelMap[@,j]->input(measure);
6604 6605
                 }

Loading…
Cancel
Save