SCRUG-NA/2025
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install SeisComP and scanloc ARM64 nightly packages

Browse Source
This commit is contained in:
Enrico Ellguth
2025-10-29 12:34:04 +00:00
parent 2ff097f9d1
commit 165b829fb7
606 changed files with 24438 additions and 16358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/seiscomp/gui/map/canvas.h
View File

@ -142,6 +142,9 @@ class SC_GUI_API Canvas : public QObject {
bool setZoomLevel(float);
float zoomLevel() const;
void setMaxZoomLevel(float);
float maxZoomLevel() const;
float pixelPerDegree() const;
void setView(QPoint c, float zoom);
@ -411,7 +414,7 @@ class SC_GUI_API Canvas : public QObject {
QColor _backgroundColor{Qt::lightGray};
uint _polygonRoughness;
double _maxZoom;
float _maxZoom;
QPointF _center;
float _zoomLevel{1.0f};
bool _grayScale{false};

3
include/seiscomp/gui/map/citieslayer.h
View File

@ -57,7 +57,8 @@ class SC_GUI_API CitiesLayer : public Layer {
private:
const Math::Geo::CityD *_selectedCity;
int _topPopulatedPlaces;
int _topPopulatedPlaces;
QPen _penHalo;
};

20
include/seiscomp/gui/map/geofeaturelayer.h
View File

@ -32,9 +32,7 @@
#include <QImage>
namespace Seiscomp {
namespace Gui {
namespace Map {
namespace Seiscomp::Gui::Map {
class Canvas;
@ -47,7 +45,7 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
public:
GeoFeatureLayer(QObject *parent = nullptr);
virtual ~GeoFeatureLayer();
~GeoFeatureLayer() override;
public:
@ -76,12 +74,12 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
*/
void renderFeatures(Canvas *canvas, QPainter &painter);
virtual void setVisible(bool flag);
virtual void bufferUpdated(Canvas *canvas, QPainter &painter);
void setVisible(bool flag) override;
void bufferUpdated(Canvas *canvas, QPainter &painter) override;
virtual QMenu *menu(QMenu*) const;
QMenu *menu(QMenu*) const override;
virtual void geoFeatureSetUpdated();
void geoFeatureSetUpdated() override;
private slots:
@ -125,7 +123,7 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
int roughness{-1};
bool filled{false};
int symbolSize{8};
QImage symbolIcon;
QPixmap symbolIcon;
QPoint symbolIconHotspot;
SymbolShape symbolShape{Disabled};
QPolygon symbolPolygon;
@ -194,9 +192,7 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
};
}
}
}
} // ns Seiscomp::Gui::Map
#endif

25
include/seiscomp/gui/map/imagetree.h
View File

@ -28,7 +28,9 @@
#endif
#include <seiscomp/gui/core/maps.h>
#include <QObject>
#include <QImage>
#include <QMutex>
namespace Seiscomp {
@ -162,11 +164,27 @@ class SC_GUI_API ImageTree : public QObject, public Core::BaseObject {
//! This function was introduced in API 1.1
bool hasPendingRequests() const { return _store && _store->hasPendingRequests(); }
//! Returns the currently attached cache instance.
//! If no cache is yet attached a new cache is
//! created and stored in the object.
/**
* @brief Returns the currently attached cache instance.
* If no cache is yet attached a new cache is created and stored in
* the object.
* @return The cache instance
*/
TextureCache *getCache();
/**
* @brief Locks the cache and avoids concurrent updates.
* This is required with multithreading applications which render in
* a different thread than the main thread and use asynchronous tile
* loading.
*/
void lockCache();
/**
* @brief Unlocks the previously locked cache.
*/
void unlockCache();
//! Empties the texture cache and tells the store to do a refresh
//! as well.
//! This function was introduced in API 1.1.
@ -194,6 +212,7 @@ class SC_GUI_API ImageTree : public QObject, public Core::BaseObject {
TileStorePtr _store;
bool _isMercatorProjected;
size_t _cacheSize;
QMutex _cacheMutex;
friend class TileStore;

3
include/seiscomp/gui/map/layers/citieslayer.h
View File

@ -57,7 +57,8 @@ class SC_GUI_API CitiesLayer : public Layer {
private:
const Math::Geo::CityD *_selectedCity;
int _topPopulatedPlaces;
int _topPopulatedPlaces;
QPen _penHalo;
};

20
include/seiscomp/gui/map/layers/geofeaturelayer.h
View File

@ -32,9 +32,7 @@
#include <QImage>
namespace Seiscomp {
namespace Gui {
namespace Map {
namespace Seiscomp::Gui::Map {
class Canvas;
@ -47,7 +45,7 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
public:
GeoFeatureLayer(QObject *parent = nullptr);
virtual ~GeoFeatureLayer();
~GeoFeatureLayer() override;
public:
@ -76,12 +74,12 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
*/
void renderFeatures(Canvas *canvas, QPainter &painter);
virtual void setVisible(bool flag);
virtual void bufferUpdated(Canvas *canvas, QPainter &painter);
void setVisible(bool flag) override;
void bufferUpdated(Canvas *canvas, QPainter &painter) override;
virtual QMenu *menu(QMenu*) const;
QMenu *menu(QMenu*) const override;
virtual void geoFeatureSetUpdated();
void geoFeatureSetUpdated() override;
private slots:
@ -125,7 +123,7 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
int roughness{-1};
bool filled{false};
int symbolSize{8};
QImage symbolIcon;
QPixmap symbolIcon;
QPoint symbolIconHotspot;
SymbolShape symbolShape{Disabled};
QPolygon symbolPolygon;
@ -194,9 +192,7 @@ class SC_GUI_API GeoFeatureLayer : public Layer,
};
}
}
}
} // ns Seiscomp::Gui::Map
#endif

24
include/seiscomp/gui/map/legend.h
View File

@ -57,6 +57,8 @@ class SC_GUI_API Legend : public QObject {
Legend &operator =(const Legend &other);
public:
virtual void bringToFront();
virtual Legend* clone() const { return nullptr; }
@ -108,17 +110,17 @@ class SC_GUI_API Legend : public QObject {
protected:
int _margin;
int _spacing;
QFont _font;
QFont _titleFont;
QSize _size;
Layer *_layer;
QString _title;
Qt::Alignment _alignment;
bool _enabled;
QPoint _pos;
bool _visible;
int _margin{9};
int _spacing{4};
QFont _font;
QFont _titleFont;
QSize _size;
Layer *_layer{nullptr};
QString _title;
Qt::Alignment _alignment{Qt::AlignLeft | Qt::AlignTop};
bool _enabled{true};
QPoint _pos;
bool _visible{true};
friend class Canvas;

8
include/seiscomp/gui/map/mapsymbol.h
View File

@ -214,11 +214,11 @@ class SC_GUI_API Symbol {
// Private data members
// ----------------------------------------------------------------------
protected:
int _type;
int _type{0};
std::string _id;
Priority _priority;
bool _clipped;
bool _visible;
Priority _priority{NONE};
bool _clipped{false};
bool _visible{true};
QPointF _location;
QPoint _position;
QSize _size;

26
include/seiscomp/gui/map/mapwidget.h
View File

@ -41,11 +41,11 @@ class QSpinBox;
namespace Seiscomp {
namespace Gui {
class SaveBNADialog : public QDialog {
class SaveGeoFeatureDialog : public QDialog {
Q_OBJECT
public:
SaveBNADialog(QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
SaveGeoFeatureDialog(QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
public:
QLineEdit *name;
@ -63,8 +63,9 @@ class SC_GUI_API MapWidget : public QWidget {
MapWidget(QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
MapWidget(const MapsDesc &meta, QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
MapWidget(Map::ImageTree *mapTree, QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
virtual ~MapWidget();
public:
Map::Canvas &canvas() { return _canvas; }
const Map::Canvas &canvas() const { return _canvas; }
@ -134,15 +135,18 @@ class SC_GUI_API MapWidget : public QWidget {
std::string _currentProjection;
bool _firstDrag;
bool _isDragging;
bool _isMeasuring;
bool _filterMap;
bool _forceGrayScale;
bool _firstDrag{false};
bool _isDragging{false};
bool _isZooming{false};
bool _isMeasuring{false};
bool _filterMap{false};
bool _forceGrayScale{false};
QVector<QPointF> _measurePoints;
QString _measureText;
SaveBNADialog *_measureBNADialog;
QVector<QPointF> _measurePoints;
QString _measureText;
SaveGeoFeatureDialog *_measureSaveDialog;
QPoint _firstDraggingPosition;
QPoint _lastDraggingPosition;
QMenu *_contextProjectionMenu;