mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove ReverseGeoLookupThread

Browse source 
Fetching the taxonomy from GPS coordinates was implemented in
a QThread. But the only access to the main function was a
direct call to run(). Thus, the thread was *never* started.
The function call was always asynchronous [it was using an
event loop though, so the UI doesn't hang]. Notably this
means that the signals connected to the thread would never
fire. And the spinner would never be activated.

Thus:
1) Turn the thread into a simple function.
2) Remove the spinner.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-11 18:44:05 +02:00 • committed by Dirk Hohndel
parent 76e5c5ac67
commit ce8199cdfd
7 changed files with 8 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

25
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -195,21 +195,6 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.cylinders->view()->horizontalHeader()->addAction(action);
}
ui.waitingSpinner->setRoundness(70.0);
ui.waitingSpinner->setMinimumTrailOpacity(15.0);
ui.waitingSpinner->setTrailFadePercentage(70.0);
ui.waitingSpinner->setNumberOfLines(8);
ui.waitingSpinner->setLineLength(5);
ui.waitingSpinner->setLineWidth(3);
ui.waitingSpinner->setInnerRadius(5);
ui.waitingSpinner->setRevolutionsPerSecond(1);
connect(ReverseGeoLookupThread::instance(), SIGNAL(finished()),
LocationInformationModel::instance(), SLOT(update()));
connect(ReverseGeoLookupThread::instance(), &QThread::finished,
this, &MainTab::setCurrentLocationIndex);
connect(ui.diveNotesMessage, &KMessageWidget::showAnimationFinished,
ui.location, &DiveLocationLineEdit::fixPopupPosition);
@ -245,16 +230,6 @@ void MainTab::setCurrentLocationIndex()
}
}
void MainTab::enableGeoLookupEdition()
{
ui.waitingSpinner->stop();
}
void MainTab::disableGeoLookupEdition()
{
ui.waitingSpinner->start();
}
void MainTab::toggleTriggeredColumn()
{
QAction *action = qobject_cast<QAction *>(sender());

2
desktop-widgets/tab-widgets/maintab.h
View file

@ -98,8 +98,6 @@ slots:
void updateTextLabels(bool showUnits = true);
void escDetected(void);
void showLocation();
void enableGeoLookupEdition();
void disableGeoLookupEdition();
void setCurrentLocationIndex();
EditMode getEditMode() const;
private:

9
desktop-widgets/tab-widgets/maintab.ui
View file

@ -230,9 +230,6 @@
</property>
</widget>
</item>
<item>
<widget class="QtWaitingSpinner" name="waitingSpinner" native="true"/>
</item>
</layout>
</item>
<item>
@ -599,12 +596,6 @@
<extends>QPlainTextEdit</extends>
<header>desktop-widgets/tagwidget.h</header>
</customwidget>
<customwidget>
<class>QtWaitingSpinner</class>
<extends>QWidget</extends>
<header>desktop-widgets/qtwaitingspinner.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>DiveLocationLineEdit</class>
<extends>QLineEdit</extends>