Re: Call for Projects: University Collaboration in Toulouse

[Kevin Ottens]

Hello,

On Thursday 16 August 2012 20:23:24 Torsten Rahn wrote:
> On Donnerstag, 16. August 2012 12:12:12 Kevin Ottens wrote:
> On behalf of the Marble Team I'd like to express our highest interest in
> participation!

OK, you're on the list now! ;-)

> The two mentors we'd provide are Dennis and me.

OK, FYI I allocated to you the "customer" role and Dennis the technical mentor
role, let me know if you prefer the other way around.

> We have a very interesting topic going on that has a lot to offer for
> students with different aspects of interest and varying capabilities:
>
> "OpenStreetMap Vector Rendering"
> [...]

I simplified that a bit in the proposal in three points:
 * Complete support for OSM vector tiles
 * Optimize the vector tile pipeline
 * Setup server for vector tiles

This way I could pick a few topics on your list below to have some diversity
in the proposal:
> Of course other topics for Marble work are welcome as well. Possible
> alternatives could cover Space + Astronomy, Historic Maps, Routing,
> GeoCaching, Natural Earth vector tile rendering (topographic map), Time &
> Animation KML enhancements, etc.

Regards.
--
Kévin Ottens, http://ervin.ipsquad.net

KDAB - proud patron of KDE, http://www.kdab.com


signature.asc
Description: This is a digitally signed message part.

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[Network Management] [PATCH] Fix decoding connection MAC address to string and enable MAC address matching between connections and interfaces

[Sebastian Krzyszkowiak]

Thanks to that UI doesn't display connections that cannot be used on specified 
interface.

BUG: 298974

Signed-off-by: Sebastian Krzyszkowiak 
---
 .../service/networkinterfaceactivatableprovider.cpp |   19 +++
 libs/service/networkinterfaceactivatableprovider.h  |1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/libs/service/networkinterfaceactivatableprovider.cpp 
b/libs/service/networkinterfaceactivatableprovider.cpp
index 1d41432..fd33930 100644
--- a/libs/service/networkinterfaceactivatableprovider.cpp
+++ b/libs/service/networkinterfaceactivatableprovider.cpp
@@ -148,6 +148,19 @@ bool 
NetworkInterfaceActivatableProvider::matches(Knm::Connection::Type connType
 ); /* TODO: implement Bluetooth Cdma, Wimax, LTE */
 }
 
+QString NetworkInterfaceActivatableProvider::macByteArrayToString(QByteArray 
array) {
+QString mac = "";
+for (int i=0; itype() == Knm::Connection::Wired) {
 Knm::WiredSetting * wiredSetting = dynamic_cast(connection->setting(Knm::Setting::Wired));
 Solid::Control::WiredNetworkInterfaceNm09 * wiredIface = 
dynamic_cast(iface);
@@ -165,7 +177,7 @@ bool 
NetworkInterfaceActivatableProvider::hardwareAddressMatches(Knm::Connection
 
 // only settings which contain a valid macaddress are interesting
 if (!wiredSetting->macaddress().isEmpty()) {
-matches = (QString(wiredSetting->macaddress()) == 
wiredIface->hardwareAddress());
+matches = (macByteArrayToString(wiredSetting->macaddress()) == 
wiredIface->hardwareAddress());
 }
 }
 } else if (connection->type() == Knm::Connection::Wireless) {
@@ -176,11 +188,10 @@ bool 
NetworkInterfaceActivatableProvider::hardwareAddressMatches(Knm::Connection
 
 // only settings which contain a valid macaddress are interesting
 if (!wirelessSetting->macaddress().isEmpty()) {
-matches = (QString(wirelessSetting->macaddress()) == 
wirelessIface->hardwareAddress());
+matches = (macByteArrayToString(wirelessSetting->macaddress()) 
== wirelessIface->hardwareAddress());
 }
 }
 }
-#endif
 return matches;
 }
 
diff --git a/libs/service/networkinterfaceactivatableprovider.h 
b/libs/service/networkinterfaceactivatableprovider.h
index 9dc995f..d11a006 100644
--- a/libs/service/networkinterfaceactivatableprovider.h
+++ b/libs/service/networkinterfaceactivatableprovider.h
@@ -62,6 +62,7 @@ class KNM_EXPORT NetworkInterfaceActivatableProvider : public 
QObject, virtual p
 {
 Q_OBJECT
 public:
+static QString macByteArrayToString(QByteArray array);
 static bool hardwareAddressMatches(Knm::Connection * connection, 
Solid::Control::NetworkInterfaceNm09 * iface);
 static bool matches(Knm::Connection::Type connType, 
Solid::Control::NetworkInterfaceNm09::Type ifaceType, 
Solid::Control::ModemNetworkInterfaceNm09::ModemCapabilities modemCaps = 
Solid::Control::ModemNetworkInterfaceNm09::None);
 
-- 
1.7.10.4


>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<