flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T215, remember last server and model as cache value

Browse Source 
* also remember last server not VATSIM server
* remember last model used
* server list selector uses remembered value
* login component sets those values
This commit is contained in:
Klaus Basan
2018-01-02 02:47:47 +01:00
parent ee0d69faf2
commit 0975abcc46
10 changed files with 103 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/components/logincomponent.cpp
View File

@@ -291,11 +291,13 @@ namespace BlackGui
// Login
msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode);
if (msg.isSuccess() && vatsimLogin)
if (msg.isSuccess())
{
Q_ASSERT_X(currentServer.isValidForLogin(), Q_FUNC_INFO, "invalid server");
m_currentVatsimServer.set(currentServer);
m_currentAircraftModel.setAndSave(ownAircraft.getModel());
m_lastServer.set(currentServer);
m_lastAircraftModel.set(ownAircraft.getModel());
ui->le_HomeBase->setText(currentServer.getUser().getHomeBase().asString());
if (vatsimLogin) { m_lastVatsimServer.set(currentServer); }
}
}
else
@@ -335,7 +337,7 @@ namespace BlackGui
CServerList vatsimFsdServers = sGui->getIContextNetwork()->getVatsimFsdServers();
if (vatsimFsdServers.isEmpty()) { return; }
vatsimFsdServers.sortBy(&CServer::getName);
const CServer currentServer = m_currentVatsimServer.get();
const CServer currentServer = m_lastVatsimServer.get();
ui->comp_VatsimServer->setServers(vatsimFsdServers, true);
ui->comp_VatsimServer->preSelect(currentServer.getName());
}
@@ -347,7 +349,7 @@ namespace BlackGui
void CLoginComponent::loadRememberedVatsimData()
{
const CServer lastServer = m_currentVatsimServer.get();
const CServer lastServer = m_lastVatsimServer.get();
const CUser lastUser = lastServer.getUser();
if (lastUser.hasValidCallsign())
{
@@ -357,7 +359,7 @@ namespace BlackGui
ui->le_VatsimHomeAirport->setText(lastUser.getHomeBase().asString());
ui->le_VatsimRealName->setText(lastUser.getRealName());
}
else
else if (CBuildConfig::isLocalDeveloperDebugBuild())
{
ui->le_Callsign->setText("SWIFT");
ui->le_VatsimId->setText("1288459");
@@ -365,7 +367,6 @@ namespace BlackGui
ui->le_VatsimHomeAirport->setText("LOWI");
ui->le_VatsimRealName->setText("Black Swift");
}
ui->comp_OtherServers->preSelect(lastServer.getName());
}
CLoginComponent::CGuiAircraftValues CLoginComponent::getAircraftValuesFromGui() const
@@ -702,7 +703,7 @@ namespace BlackGui
CAircraftModel CLoginComponent::getPrefillModel() const
{
CAircraftModel model = m_currentAircraftModel.get();
const CAircraftModel model = m_lastAircraftModel.get();
if (model.hasAircraftDesignator()) { return model; }
return IContextOwnAircraft::getDefaultOwnAircraftModel();
}

9
src/blackgui/components/logincomponent.h
View File

@@ -16,12 +16,14 @@
#include "blackcore/data/vatsimsetup.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/settings/guisettings.h"
#include "blackmisc/simulation/data/lastmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/data/lastserver.h"
#include "blackmisc/network/entityflags.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/user.h"
#include "blackmisc/digestsignal.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/datacache.h"
@@ -217,8 +219,9 @@ namespace BlackGui
const int LogoffIntervalSeconds = 20; //!< time before logoff
QTimer *m_logoffCountdownTimer { nullptr }; //!< timer for logoff countdown
BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TTrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::reloadSettings };
BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this }; //!< current settings of aircraft
BlackMisc::CData<BlackCore::Data::TVatsimCurrentServer> m_currentVatsimServer { this }; //!< cache for current VATSIM server
BlackMisc::CData<BlackMisc::Simulation::Data::TLastModel> m_lastAircraftModel { this }; //!< recently used aircraft model
BlackMisc::CData<BlackMisc::Network::Data::TLastServer> m_lastServer { this }; //!< recently used server (VATSIM, other)
BlackMisc::CData<BlackCore::Data::TVatsimLastServer> m_lastVatsimServer { this }; //!< recently used VATSIM server
};
} // namespace
} // namespace

8
src/blackgui/components/serverlistselector.cpp
View File

@@ -27,7 +27,13 @@ namespace BlackGui
{
CServerListSelector::CServerListSelector(QWidget *parent) :
QComboBox(parent)
{ }
{
const CServer server = m_lastServer.get();
if (server.hasName())
{
m_pendingPreselect = server.getName();
}
}
void CServerListSelector::setServers(const CServerList &servers, bool nameIsCountry)
{

4
src/blackgui/components/serverlistselector.h
View File

@@ -13,9 +13,10 @@
#define BLACKGUI_COMPONENTS_SERVERLISTSELECTOR_H
#include "blackgui/blackguiexport.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/data/lastserver.h"
#include "blackmisc/network/serverlist.h"
#include "blackmisc/country.h"
#include "blackmisc/datacache.h"
#include <QComboBox>
#include <QObject>
@@ -58,6 +59,7 @@ namespace BlackGui
BlackMisc::Network::CServerList m_servers; //!< corresponding servers
QStringList m_items; //!< items strings
QString m_pendingPreselect; //!< pending preselect value
BlackMisc::CData<BlackMisc::Network::Data::TLastServer> m_lastServer { this }; //!< recently used server (VATSIM, other)
};
} // ns
} // ns