Merge with dev

This commit is contained in:
Desmis
2019-09-02 08:38:33 +02:00
5 changed files with 50 additions and 6 deletions

View File

@@ -729,7 +729,7 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
imageNumber->remove_all();
imageNumber->append("1");
for (int i = 2; i <= std::min(n, 4); ++i) {
for (int i = 2; i <= std::min(n, 6); ++i) {
std::ostringstream entry;
entry << i;
imageNumber->append(entry.str());