fix: dbus存在问题,已经修改
Description: dbus和本地代码不一样,合并错误,带名称的打开图像接口 Log: 与dbus有关 Change-Id: Ica50c51011fee5ab39a0c46351da446dcc13ea67
This commit is contained in:
parent
9d1d8aafc1
commit
6292e44721
|
@ -287,7 +287,7 @@ void MainWidget::openImage(const QString &path)
|
||||||
if (m_imageview) {
|
if (m_imageview) {
|
||||||
QImage img(path);
|
QImage img(path);
|
||||||
m_imgName = path;
|
m_imgName = path;
|
||||||
openImage(img);
|
openImage(img, m_imgName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ public Q_SLOTS: // METHODS
|
||||||
* @return: QDBusPendingReply
|
* @return: QDBusPendingReply
|
||||||
* @note:
|
* @note:
|
||||||
*/
|
*/
|
||||||
inline QDBusPendingReply<> openImageAndName(const QImage &image,const QString &imageName)
|
inline QDBusPendingReply<> openImageAndName(const QImage &image, const QString &imageName)
|
||||||
{
|
{
|
||||||
qDebug() << __FUNCTION__;
|
qDebug() << __FUNCTION__;
|
||||||
QByteArray data;
|
QByteArray data;
|
||||||
|
@ -97,7 +97,7 @@ public Q_SLOTS: // METHODS
|
||||||
data = qCompress(data, 9);
|
data = qCompress(data, 9);
|
||||||
data = data.toBase64();
|
data = data.toBase64();
|
||||||
}
|
}
|
||||||
return call(QStringLiteral("openImage"), QVariant::fromValue(data),imageName);
|
return call(QStringLiteral("openImageAndName"), QVariant::fromValue(data), imageName);
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_SIGNALS: // SIGNALS
|
Q_SIGNALS: // SIGNALS
|
||||||
|
|
Loading…
Reference in New Issue
Block a user