caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mode: refactor next selected mode when a tab is closed

Browse Source
This commit is contained in:
Kiara Navarro 2022-07-08 23:16:59 -05:00
parent 77e0d156d0
commit 287ee3757f
No known key found for this signature in database
GPG Key ID: CBA9F2172CE33FBA
1 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Software/PC_Application/modehandler.cpp
View File

@ -49,8 +49,7 @@ std::vector<Mode*> ModeHandler::getModes()
void ModeHandler::setCurrentIndex(int index) void ModeHandler::setCurrentIndex(int index)
{ {
// if ( (getCurrentIndex() != index) && (index >= 0)) { if (index >= 0) {
if ( (getCurrentIndex() != index) && (index >= 0)) {
currentModeIndex = index; currentModeIndex = index;
auto * m = getMode(getCurrentIndex()); auto * m = getMode(getCurrentIndex());
m->activate(); m->activate();
@ -75,13 +74,51 @@ int ModeHandler::getCurrentIndex()
void ModeHandler::closeMode(int index) void ModeHandler::closeMode(int index)
{ {
disconnect(modes.at(index), &Mode::statusbarMessage, this, &ModeHandler::setStatusBarMessageChanged); disconnect(modes.at(index), &Mode::statusbarMessage, this, &ModeHandler::setStatusBarMessageChanged);
delete modes.at(index);
modes.erase(modes.begin() + index); std::vector<int> idx;
for(int i=0; i < int(modes.size()); i++)
{
idx.push_back(i);
}
auto left = std::find(idx.begin(), idx.end(), getCurrentIndex()-1);
auto right = std::find(idx.begin(), idx.end(), getCurrentIndex()+1);
auto foundLeft = false;
auto foundRight = false;
if ( left != idx.end() )
{
foundLeft = true;
}
if ( right != idx.end() )
{
foundRight = true;
}
auto lastIndex = getCurrentIndex();
if (int(modes.size()) > 0) { if (int(modes.size()) > 0) {
if (getCurrentIndex() == index) { if (getCurrentIndex() == index)
setCurrentIndex(getCurrentIndex()-1); // Select bar before one deleted {
if (foundLeft)
{
setCurrentIndex(getCurrentIndex()-1);
}
else if (foundRight)
{
setCurrentIndex(getCurrentIndex()+1);
}
} }
} }
delete modes.at(index);
modes.erase(modes.begin() + index);
if (getCurrentIndex() == 1 && lastIndex == 0) {
setCurrentIndex(0);
}
emit ModeClosed(index); emit ModeClosed(index);
} }
@ -157,3 +194,4 @@ void ModeHandler::setAveragingMode(Averaging::Mode value)
} }
} }
} }