jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2025-12-06 07:12:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

adjust scope of enum declaration to fix macOS builds

Browse source
This commit is contained in:
Jan Käberich 2025-05-04 13:17:16 +02:00
parent 199bb7bbd7
commit 8a5d56ee39
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.cpp
View file

@ -342,7 +342,7 @@ bool CompoundDriver::setVNA(const DeviceDriver::VNASettings &s, std::function<vo
}); });
} }
lastNonIdleSettings.type = lastNonIdleSettings.Types::VNA; lastNonIdleSettings.type = Types::VNA;
lastNonIdleSettings.vna = s; lastNonIdleSettings.vna = s;
isIdle = false; isIdle = false;
@ -403,7 +403,7 @@ bool CompoundDriver::setSA(const DeviceDriver::SASettings &s, std::function<void
} }
} }
lastNonIdleSettings.type = lastNonIdleSettings.Types::SA; lastNonIdleSettings.type = Types::SA;
lastNonIdleSettings.sa = s; lastNonIdleSettings.sa = s;
isIdle = false; isIdle = false;
@ -438,7 +438,7 @@ bool CompoundDriver::setSG(const DeviceDriver::SGSettings &s)
success &= devices[i]->setSG(devSettings); success &= devices[i]->setSG(devSettings);
} }
lastNonIdleSettings.type = lastNonIdleSettings.Types::SG; lastNonIdleSettings.type = Types::SG;
lastNonIdleSettings.sg = s; lastNonIdleSettings.sg = s;
isIdle = false; isIdle = false;
@ -514,13 +514,13 @@ bool CompoundDriver::setExtRef(QString option_in, QString option_out)
} }
// restore last non idle state // restore last non idle state
switch(lastNonIdleSettings.type) { switch(lastNonIdleSettings.type) {
case lastNonIdleSettings.Types::VNA: case Types::VNA:
setVNA(lastNonIdleSettings.vna); setVNA(lastNonIdleSettings.vna);
break; break;
case lastNonIdleSettings.Types::SA: case Types::SA:
setSA(lastNonIdleSettings.sa); setSA(lastNonIdleSettings.sa);
break; break;
case lastNonIdleSettings.Types::SG: case Types::SG:
setSG(lastNonIdleSettings.sg); setSG(lastNonIdleSettings.sg);
break; break;
} }

3
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.h
View file

@ -207,11 +207,12 @@ private:
std::vector<LibreVNADriver*> devices; std::vector<LibreVNADriver*> devices;
bool zerospan; bool zerospan;
bool isIdle; bool isIdle;
enum class Types{VNA, SA, SG};
struct { struct {
VNASettings vna; VNASettings vna;
SASettings sa; SASettings sa;
SGSettings sg; SGSettings sg;
enum class Types{VNA, SA, SG} type; Types type;
} lastNonIdleSettings; } lastNonIdleSettings;
unsigned int VNApoints; unsigned int VNApoints;
unsigned int SApoints; unsigned int SApoints;