Differential D14835 Diff 39698 libs/models/networkmodel.cpp

Changeset View

Standalone View

View Options

libs/models/networkmodel.cpp

Show First 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)52 switch (role) {
101 case UniRole: 101​ case UniRole:
102 return item->uni(); 102​ return item->uni();
103 case UuidRole: 103​ case UuidRole:
104 return item->uuid(); 104​ return item->uuid();
105 case VpnState: 105​ case VpnState:
106 return item->vpnState(); 106​ return item->vpnState();
107 case VpnType: 107​ case VpnType:
108 return item->vpnType(); 108​ return item->vpnType();
109​ case RxBytesRole:
110​ return item->rxBytes();
111​ case TxBytesRole:
112​ return item->txBytes();
109 default: 113​ default:
110 break; 114​ break;
111 } 115​ }
112 } 116​ }
113 117​
114 return QVariant(); 118​ return QVariant();
115} 119​}
116 120​
Show All 27 Lines128{
144 roles[SecurityTypeRole] = "SecurityType"; 148​ roles[SecurityTypeRole] = "SecurityType";
145 roles[SecurityTypeStringRole] = "SecurityTypeString"; 149​ roles[SecurityTypeStringRole] = "SecurityTypeString";
146 roles[TimeStampRole] = "TimeStamp"; 150​ roles[TimeStampRole] = "TimeStamp";
147 roles[TypeRole] = "Type"; 151​ roles[TypeRole] = "Type";
148 roles[UniRole] = "Uni"; 152​ roles[UniRole] = "Uni";
149 roles[UuidRole] = "Uuid"; 153​ roles[UuidRole] = "Uuid";
150 roles[VpnState] = "VpnState"; 154​ roles[VpnState] = "VpnState";
151 roles[VpnType] = "VpnType"; 155​ roles[VpnType] = "VpnType";
156​ roles[RxBytesRole] = "RxBytes";
157​ roles[TxBytesRole] = "TxBytes";
152 158​
153 return roles; 159​ return roles;
154} 160​}
155 161​
156void NetworkModel::initialize() 162​void NetworkModel::initialize()
157{ 163​{
158 // Initialize existing connections 164​ // Initialize existing connections
159 for (const NetworkManager::Connection::Ptr &connection : NetworkManager::listConnections()) { 165​ for (const NetworkManager::Connection::Ptr &connection : NetworkManager::listConnections()) {
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)
205{ 211​{
206 connect(device.data(), &NetworkManager::Device::availableConnectionAppeared, this, &NetworkModel::availableConnectionAppeared, Qt::UniqueConnection); 212​ connect(device.data(), &NetworkManager::Device::availableConnectionAppeared, this, &NetworkModel::availableConnectionAppeared, Qt::UniqueConnection);
207 connect(device.data(), &NetworkManager::Device::availableConnectionDisappeared, this, &NetworkModel::availableConnectionDisappeared, Qt::UniqueConnection); 213​ connect(device.data(), &NetworkManager::Device::availableConnectionDisappeared, this, &NetworkModel::availableConnectionDisappeared, Qt::UniqueConnection);
208 connect(device.data(), &NetworkManager::Device::ipV4ConfigChanged, this, &NetworkModel::ipConfigChanged, Qt::UniqueConnection); 214​ connect(device.data(), &NetworkManager::Device::ipV4ConfigChanged, this, &NetworkModel::ipConfigChanged, Qt::UniqueConnection);
209 connect(device.data(), &NetworkManager::Device::ipV6ConfigChanged, this, &NetworkModel::ipConfigChanged, Qt::UniqueConnection); 215​ connect(device.data(), &NetworkManager::Device::ipV6ConfigChanged, this, &NetworkModel::ipConfigChanged, Qt::UniqueConnection);
210 connect(device.data(), &NetworkManager::Device::ipInterfaceChanged, this, &NetworkModel::ipInterfaceChanged); 216​ connect(device.data(), &NetworkManager::Device::ipInterfaceChanged, this, &NetworkModel::ipInterfaceChanged);
211 connect(device.data(), &NetworkManager::Device::stateChanged, this, &NetworkModel::deviceStateChanged, Qt::UniqueConnection); 217​ connect(device.data(), &NetworkManager::Device::stateChanged, this, &NetworkModel::deviceStateChanged, Qt::UniqueConnection);
212 218​
219​ auto deviceStatistics = device->deviceStatistics();
220​ deviceStatistics->setRefreshRateMs(2000);
broulikUnsubmitted
Done

Would it be better to only request the data when the statistics are open to avoid wakeups and processing?

broulik: Would it be better to only request the data when the statistics are open to avoid wakeups and…
volkovAuthorUnsubmitted
Not Done

Yes, good point.

volkov: Yes, good point.
221​ connect(deviceStatistics.data(), &NetworkManager::DeviceStatistics::rxBytesChanged, this, [this, device](qulonglong rxBytes) {
222​ for (auto *item : m_list.returnItems(NetworkItemsList::Device, device->uni())) {
223​ item->setRxBytes(rxBytes);
224​ updateItem(item);
225​ }
226​ });
227​ connect(deviceStatistics.data(), &NetworkManager::DeviceStatistics::txBytesChanged, this, [this, device](qulonglong txBytes) {
228​ for (auto *item : m_list.returnItems(NetworkItemsList::Device, device->uni())) {
229​ item->setTxBytes(txBytes);
230​ updateItem(item);
231​ }
232​ });
233​
213 if (device->type() == NetworkManager::Device::Wifi) { 234​ if (device->type() == NetworkManager::Device::Wifi) {
214 NetworkManager::WirelessDevice::Ptr wifiDev = device.objectCast<NetworkManager::WirelessDevice>(); 235​ NetworkManager::WirelessDevice::Ptr wifiDev = device.objectCast<NetworkManager::WirelessDevice>();
215 connect(wifiDev.data(), &NetworkManager::WirelessDevice::networkAppeared, this, &NetworkModel::wirelessNetworkAppeared, Qt::UniqueConnection); 236​ connect(wifiDev.data(), &NetworkManager::WirelessDevice::networkAppeared, this, &NetworkModel::wirelessNetworkAppeared, Qt::UniqueConnection);
216 connect(wifiDev.data(), &NetworkManager::WirelessDevice::networkDisappeared, this, &NetworkModel::wirelessNetworkDisappeared, Qt::UniqueConnection); 237​ connect(wifiDev.data(), &NetworkManager::WirelessDevice::networkDisappeared, this, &NetworkModel::wirelessNetworkDisappeared, Qt::UniqueConnection);
217 238​
218 } 239​ }
219 240​
220#if WITH_MODEMMANAGER_SUPPORT 241​#if WITH_MODEMMANAGER_SUPPORT
▲ Show 20 Lines • Show All 789 Lines • Show Last 20 Lines