Skip to content

Commit da62671

Browse files
committed
fix: [build] build error
Log: as title
1 parent 3abefdd commit da62671

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

src/main.cpp

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,7 @@ void showWatermark(const QString &sJson, MainWindow *w)
6262
WaterMarkData data = ins->data();
6363
// DTKWidget 主线和定制线的水印接口不同,通过版本进行区分
6464
// 主线水印接口在 5.6.9 之后引入.
65-
// 因此,判断定制线:存在水印接口,版本不低于 5.4.42.7 且低于 5.5
66-
#if DTK_VERSION_CHECK(5, 4, 42, 7) <= DTK_VERSION && DTK_VERSION < DTK_VERSION_CHECK(5, 5, 0, 0)
67-
//接口变动为结构体
68-
data.text = mapwaterMark.value("text").toString();
69-
data.type = WaterMarkType::Text;
70-
data.layout = mapwaterMark.value("layout").toInt() == 1 ? WaterMarkLayout::Tiled : WaterMarkLayout::Center;
71-
data.rotation = mapwaterMark.value("angle").toInt();
72-
data.color = QColor(mapwaterMark.value("color").toString().toUInt(nullptr, 16));
73-
auto font = QFont(mapwaterMark.value("font").toString());
74-
font.setPointSize(mapwaterMark.value("fontSize").toInt());
75-
data.font = font;
76-
data.spacing = mapwaterMark.value("columnSpacing").toInt();
77-
data.lineSpacing = mapwaterMark.value("rowSpacing").toInt();
78-
data.opacity = mapwaterMark.value("opacity").toInt()/255.0;
79-
data.grayScale = true;
80-
//显示放大倍数
81-
if(mapwaterMark.contains("ignoreDevicePixelRatio") && mapwaterMark.value("ignoreDevicePixelRatio").toBool()){
82-
qreal deviceRatio = qApp->devicePixelRatio();
83-
data.font.setPointSizeF(data.font.pointSizeF()/deviceRatio);
84-
data.spacing /= deviceRatio;
85-
data.lineSpacing /= deviceRatio;
86-
}
87-
88-
#else
65+
#if DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 9, 0)
8966
data.setText(mapwaterMark.value("text").toString());
9067
data.setType(WaterMarkData::Text);
9168
data.setLayout(mapwaterMark.value("layout").toInt() == 1 ? WaterMarkData::Tiled : WaterMarkData::Center);
@@ -107,6 +84,27 @@ void showWatermark(const QString &sJson, MainWindow *w)
10784
data.setSpacing(data.spacing() / deviceRatio);
10885
data.setLineSpacing(data.lineSpacing() / deviceRatio);
10986
}
87+
#else
88+
//接口变动为结构体
89+
data.text = mapwaterMark.value("text").toString();
90+
data.type = WaterMarkType::Text;
91+
data.layout = mapwaterMark.value("layout").toInt() == 1 ? WaterMarkLayout::Tiled : WaterMarkLayout::Center;
92+
data.rotation = mapwaterMark.value("angle").toInt();
93+
data.color = QColor(mapwaterMark.value("color").toString().toUInt(nullptr, 16));
94+
auto font = QFont(mapwaterMark.value("font").toString());
95+
font.setPointSize(mapwaterMark.value("fontSize").toInt());
96+
data.font = font;
97+
data.spacing = mapwaterMark.value("columnSpacing").toInt();
98+
data.lineSpacing = mapwaterMark.value("rowSpacing").toInt();
99+
data.opacity = mapwaterMark.value("opacity").toInt()/255.0;
100+
data.grayScale = true;
101+
//显示放大倍数
102+
if(mapwaterMark.contains("ignoreDevicePixelRatio") && mapwaterMark.value("ignoreDevicePixelRatio").toBool()){
103+
qreal deviceRatio = qApp->devicePixelRatio();
104+
data.font.setPointSizeF(data.font.pointSizeF()/deviceRatio);
105+
data.spacing /= deviceRatio;
106+
data.lineSpacing /= deviceRatio;
107+
}
110108
#endif
111109
ins->setData(data);
112110
ins->registerWidget(w);

0 commit comments

Comments
 (0)