Compare commits

...

7 Commits

Author SHA1 Message Date
681a79a672 some fixes 2025-11-28 22:18:37 +03:00
88bcc7f2e9 OSM map tile provider change default to https 2025-10-08 16:56:01 +03:00
04d9cf6edf .clang-format 2025-09-21 21:08:26 +03:00
66dc481d6e .clang-format 2025-09-19 17:39:59 +03:00
f8e361190b version 2.32.2 2025-07-17 11:17:32 +03:00
745376adfb Merge branch 'master' of https://git.shstk.ru/SHS/qad 2025-07-13 00:28:58 +03:00
13d4e6cb75 gesture pitch & pan fix 2025-07-13 00:28:53 +03:00
6 changed files with 9 additions and 9 deletions

View File

@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
LambdaBodyIndentation: Signature
MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
MaxEmptyLinesToKeep: 2
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto

View File

@@ -4,7 +4,7 @@ cmake_policy(SET CMP0072 NEW) # FindOpenGL prefers GLVND by default
project(QAD)
set(QAD_MAJOR 2)
set(QAD_MINOR 32)
set(QAD_REVISION 1)
set(QAD_REVISION 2)
set(QAD_SUFFIX )
set(QAD_COMPANY SHS)
set(QAD_DOMAIN org.SHS)

View File

@@ -342,6 +342,7 @@ void Graphic::procGesture(QGesture * g) {
QPointF dp = -pg->delta();
dp.rx() /= getScaleX();
dp.ry() /= getScaleY();
dp.ry() = -dp.y();
selrect.translate(dp);
totalUpdate();
} break;
@@ -357,11 +358,7 @@ void Graphic::procGesture(QGesture * g) {
} break;
case Qt::TapAndHoldGesture: {
QTapAndHoldGesture * pg = (QTapAndHoldGesture *)g;
if (pg->state() == Qt::GestureStarted)
QMetaObject::invokeMethod(
this,
[this]() { showMenu(); },
Qt::QueuedConnection);
if (pg->state() == Qt::GestureStarted) QMetaObject::invokeMethod(this, [this]() { showMenu(); }, Qt::QueuedConnection);
} break;
default: break;
}

View File

@@ -182,6 +182,7 @@ void GraphicAnalysis::updateGraphic(int index) {
void GraphicAnalysis::updateAllGraphic() {
for (int i = 0; i < graphicsCount(); ++i)
updateGraphic(i);
updateGraphics();
}
@@ -261,11 +262,13 @@ void GraphicAnalysis::addPoint(const QPointF & p, int graphic, bool update_) {
void GraphicAnalysis::setGraphicTransformFunction(std::function<QPolygonF(const QPolygonF &)> f) {
tf_gr = f;
updateAllGraphic();
}
void GraphicAnalysis::setSpectrumTransformFunction(std::function<QPolygonF(const QPolygonF &)> f) {
tf_fft = f;
updateAllGraphic();
}

View File

@@ -8,7 +8,7 @@
MapViewTileProvider_OSM::MapViewTileProvider_OSM() {
nam = new QNetworkAccessManager();
PIValueTree p;
p.addChild(PIValueTree("url", "http://tile.openstreetmap.org"));
p.addChild(PIValueTree("url", "https://tile.openstreetmap.org"));
initParameters(p);
}

View File

@@ -608,7 +608,7 @@ void PIValueTreeEdit::applyVariantEdit(PIVariantEdit * ve, const PIValueTree & v
ve->setAttributes(attributesWithRO(vt.attributes()));
ve->setValue(vt.value());
ve->setFullEditMode(is_full_edit);
ve->setToolTip(PI2QString(vt.attribute(PIValueTree::Attribute::toolTip).toString()));
ve->setToolTip(PIVariantEditorBase::vtTr(vt.attribute(PIValueTree::Attribute::toolTip).toString()));
}