Skip to content

Commit 4c142ec

Browse files
committed
minor
1 parent fe434bd commit 4c142ec

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/BehavioralBoxLabjack.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,10 @@ void BehavioralBoxLabjack::LoadActiveLogicalInputChannelsConfig()
641641
else
642642
{
643643
// The file was found
644-
auto m = pfd::message::message("File found!", "Loading JSON...");
644+
//auto m = pfd::message::message("File found!", "Loading JSON...");
645+
auto m = pfd::notify::notify("File found!", "Loading JSON...", pfd::icon::info);
646+
647+
645648
}
646649

647650

@@ -868,8 +871,10 @@ void BehavioralBoxLabjack::SetupStream()
868871
WriteNameOrDie(this->handle, "AIN_ALL_NEGATIVE_CH", AIN_ALL_NEGATIVE_CH);
869872

870873
// Build the stream object:
874+
const double stream_scan_rate_Hz = 20.0;
875+
871876
auto currChannelNames = this->getInputPortNames(PortEnumerationMode::portNames, true, true);
872-
this->ljStreamInfo.build(currChannelNames, 200);
877+
this->ljStreamInfo.build(currChannelNames, stream_scan_rate_Hz);
873878

874879
this->err = LJM_NamesToAddresses(this->ljStreamInfo.numChannels, const_cast<const char**>(this->ljStreamInfo.channelNames), this->ljStreamInfo.aScanList, NULL);
875880
ErrorCheck(this->err, "Getting positive channel addresses");

src/FilesystemHelpers.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include "FilesystemHelpers.h"
77
//Manhong-001 get the experimentName in the ini file
88
#include "ConfigurationManager.h"
9+
// For GUI file selection/save/load dialogs:
10+
#include "External/portable-file-dialogs.h"
911

1012
template<bool RECURSIVE>
1113
inline std::vector<fs::path> FilesystemHelpers::file_list(fs::path dir, std::regex ext_pattern)

0 commit comments

Comments
 (0)