#include <QString>
#include <QStringList>
#include <QCoreApplication>
+#include <QMap>
+#include <QMapIterator>
+#include <QList>
Locations* Locations::m_instance = 0;
Locations::Locations() :
m_locationStorage(QHash<QString,Location *>()),
- m_indexStorage(QHash<QString, int>()),
+ m_indexStorage(QList<QString>()),
m_gpsLocation(new Location("GPS"))
{
this->restoreLocations();
qDebug() << "Index storage:";
qDebug() << this->m_indexStorage;
qDebug() << "Size of index storage:" << this->m_indexStorage.size();
- this->m_indexStorage.insert(location->label(), this->m_indexStorage.size() + 1);
+ this->m_indexStorage.append(location->label());
qDebug() << "Index storage after inserting location:";
qDebug() << this->m_indexStorage;
addedNew = true;
- emit(locationsChanged());
} else {
qDebug() << "A location with the same label (" << location->label() << ") already exists.";
this->m_locationStorage.remove(location->label());
this->m_locationStorage[location->label()] = location;
}
+ emit(locationsChanged());
- // if it's valid now, save the setting
- if ( location->isValid() ) {
- this->saveLocation(location, this->m_indexStorage.value(location->label()));
- }
+ // save the location to settings
+ this->saveLocation(location);
return addedNew;
}
settings.beginGroup("Locations");
QStringList labels = settings.childGroups();
+ QMap<QString, int> tempIndex = QMap<QString, int>();
+
for( int i=0; i<labels.size(); ++i ) {
QString label = labels[i];
settings.beginGroup(label);
- QString x = settings.value( "x" ).toString();
- QString y = settings.value( "y" ).toString();
- QString address = settings.value( "address" ).toString();
+ QString address, x, y;
+ bool valid = false;
+ if (settings.contains("address")) {
+ address = settings.value( "address" ).toString();
+ if (settings.contains("x")) {
+ x = settings.value( "x" ).toString();
+ if (settings.contains("y")) {
+ y = settings.value( "y" ).toString();
+ valid = true;
+ }
+ }
+ }
int index = settings.value("index").toInt();
settings.endGroup();
qDebug() << "Restoring " << label;
- Location *location = new Location( x, y, label );
- location->setAddress(address);
+ Location *location;
+ if (valid) {
+ location = new Location( x, y, label );
+ location->setAddress(address);
+ }
+ else
+ location = new Location(label);
this->m_locationStorage[label] = location;
- this->m_indexStorage.insert(label,this->m_indexStorage.size() + 1);
+ this->m_indexStorage.append(label);
if (index != 0)
- this->changeIndex(label, index, false);
+ tempIndex.insert(label, index);
}
settings.endGroup();
+
+ qDebug() << "Locations indexes before restoring positions";
+ qDebug() << this->m_indexStorage;
+ qDebug() << "Restoring these locations positions.";
+ qDebug() << tempIndex;
+
+ // Swap locations to correct indexes.
+ QMap<QString, int>::iterator it, ite;
+ for (it = tempIndex.begin(), ite = tempIndex.end(); it != ite; ++it)
+ {
+ int oldIndex = this->m_indexStorage.indexOf(it.key());
+ // Only operate on this item if current index is not the same as specified
+ if (it.value() != oldIndex + 1)
+ {
+ // Move to last if requested index is greater than the number of items.
+ if (it.value() >= this->m_indexStorage.size()) {
+ this->m_indexStorage.swap(oldIndex, this->m_indexStorage.size() - 1);
+ }
+ else {
+ this->m_indexStorage.swap(oldIndex, it.value() - 1);
+ }
+ }
+ }
+
+ qDebug() << "Locations indexes after positions are restored.";
+ qDebug() << this->m_indexStorage;
}
-void Locations::saveLocation(Location *location, int index)
+void Locations::saveLocation(Location *location)
{
+ if (!location) {
+ qDebug() << "Null location given to saveLocation. Aborting";
+ return;
+ }
qDebug() << "Saving location " << location->label();
QSettings settings;
settings.beginGroup("Locations");
settings.beginGroup(location->label() );
- settings.setValue( "address", location->address() );
- settings.setValue( "x", location->x() );
- settings.setValue( "y", location->y() );
- settings.setValue("index", index);
+ if (location->isValid()) {
+ settings.setValue( "address", location->address() );
+ settings.setValue( "x", location->x() );
+ settings.setValue( "y", location->y() );
+ }
+ else {
+ if (settings.contains("address")) settings.remove("address");
+ if (settings.contains("x")) settings.remove("x");
+ if (settings.contains("y")) settings.remove("y");
+ }
+ settings.setValue("index", this->m_indexStorage.indexOf(location->label()) + 1);
settings.endGroup();
settings.endGroup();
}
qDebug() << "Given location exists in settings -> removing it";
settings.remove(location->label());
succeeded = true;
- emit(locationsChanged());
}
settings.endGroup();
{
qDebug() << "Given location exists in locations list -> removing it";
this->m_locationStorage.remove(location->label());
- int remIndex = this->m_indexStorage.value(location->label());
- this->m_indexStorage.remove(location->label());
- QHash<QString, int>::iterator it, ite;
- for (it = this->m_indexStorage.begin(), ite = this->m_indexStorage.end(); it != ite; ++it)
+ //int remIndex = this->m_indexStorage.value(location->label());
+ this->m_indexStorage.removeOne(location->label());
+ /*for (int ind = 0; ind < this->m_indexStorage.size(); ++ind)
{
- if (it.value() > remIndex)
+ if (this->m_indexStorage.value(this->m_indexStorage > remIndex)
+ {
it.value() -= 1;
- }
+ this->saveLocation(this->getLocation(it.key()), it.value());
+ }
+ }*/
emit(locationsChanged());
}
return succeeded;
return retVal;
}
-void Locations::changeIndex(const QString &label, const int &index, bool signal)
+/*void Locations::changeIndex(const QString &label, const int &index, bool signal)
{
int oldIndex = this->m_indexStorage.value(label);
if (index == oldIndex)
qDebug() << this->m_indexStorage;
if (signal)
emit(locationsChanged());
-}
+}*/
Location *Locations::getLocation(const int &index) const
{
qDebug() << "Getting location for index" << index;
Location *loc = 0;
- QString label;
+ /*QString label;
if (this->findLabel(index, label))
{
qDebug() << "Found a label with given index " << index;
qDebug() << "Found label is " << label;
loc = this->getLocation(label);
- }
+ }*/
+ if (index <= 0 || index > this->m_indexStorage.size())
+ return loc;
+
+ QString label = this->m_indexStorage.at(index - 1);
+ loc = this->m_locationStorage.value(label);
return loc;
}
-bool Locations::findLabel(const int &index, QString &label) const
+/*bool Locations::findLabel(const int &index, QString &label) const
{
qDebug() << "Finding label for index" << index << ". Number of items in indexStorage:" << this->m_indexStorage.size() << ". Number of items in locationStorage:" << this->m_locationStorage.size();
qDebug() << "Location storage";
}
qDebug() << "Returning from label search.";
return found;
-}
+}*/
/*const QHash<QString, Location *>& Locations::getLocations() const
{
bool Locations::increaseLocationIndex(const QString &label)
{
if (!this->m_indexStorage.contains(label))
+ {
+ qDebug() << "Given label \"" << label << "\" does not exist in indexStorage.";
+ qDebug() << "Contents of indexStorage: " << this->m_indexStorage;
return false;
+ }
qDebug() << "Increasing index by one for label" << label;
- bool done = false;
- int oldIndex = this->m_indexStorage.value(label);
- QString otherLabel;
+ int oldIndex = this->m_indexStorage.indexOf(label);
+ if (oldIndex == -1)
+ return false;
+ if (oldIndex == this->m_indexStorage.size() - 1)
+ return false;
+ this->m_indexStorage.move(oldIndex, oldIndex + 1);
+ this->saveLocation(this->m_locationStorage.value(label));
+ emit(locationsChanged());
+ /*QString otherLabel;
if (this->findLabel(oldIndex + 1, otherLabel))
{
this->m_indexStorage[label] = oldIndex + 1;
this->m_indexStorage[otherLabel] = oldIndex;
done = true;
emit(locationsChanged());
- }
- return done;
+ }*/
+ return true;
}
bool Locations::lowerLocationIndex(const QString &label)
if (!this->m_indexStorage.contains(label))
return false;
qDebug() << "Lowering index by one for label" << label;
- bool done = false;
- int oldIndex = this->m_indexStorage[label];
- QString otherLabel;
+ int oldIndex = this->m_indexStorage.indexOf(label);
+ if (oldIndex == -1) //Not found
+ return false;
+ if (oldIndex == 0) // Already first
+ return false;
+ this->m_indexStorage.move(oldIndex, oldIndex - 1);
+ this->saveLocation(this->m_locationStorage.value(label));
+ emit(locationsChanged());
+ /*QString otherLabel;
if (this->findLabel(oldIndex - 1, otherLabel))
{
this->m_indexStorage[label] = oldIndex - 1;
this->m_indexStorage[otherLabel] = oldIndex;
done = true;
emit(locationsChanged());
- }
- return done;
+ }*/
+ return true;
}
int Locations::size() const
projects / ptas / blobdiff