This commit is contained in:
Klaus Basan
2019-11-10 00:13:49 +01:00
committed by Mat Sutcliffe
parent 964948e3e8
commit 3705818445
2 changed files with 13 additions and 20 deletions

View File

@@ -15,8 +15,7 @@ namespace BlackGui
{ {
namespace Views namespace Views
{ {
CRadarView::CRadarView(QWidget *parent) CRadarView::CRadarView(QWidget *parent) : QGraphicsView(parent)
: QGraphicsView(parent)
{ {
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -33,15 +32,9 @@ namespace BlackGui
void CRadarView::wheelEvent(QWheelEvent *event) void CRadarView::wheelEvent(QWheelEvent *event)
{ {
const QPoint delta = event->angleDelta(); const QPoint delta = event->angleDelta();
if (delta.y() > 0)
{
emit zoomEvent(true);
}
else
{
emit zoomEvent(false);
}
event->accept(); event->accept();
const bool zoom = (delta.y() > 0);
emit zoomEvent(zoom);
} }
} // ns } // ns
} // ns } // ns

View File

@@ -105,7 +105,7 @@ namespace BlackGui
return nullptr; return nullptr;
} }
Q_UNUSED(sort); Q_UNUSED(sort)
ModelClass *model = this->derivedModel(); ModelClass *model = this->derivedModel();
const auto sortColumn = model->getSortColumn(); const auto sortColumn = model->getSortColumn();
const auto sortOrder = model->getSortOrder(); const auto sortOrder = model->getSortOrder();
@@ -476,7 +476,7 @@ namespace BlackGui
{ {
const QFileInfo fi = CGuiUtility::representedMimeFile(event->mimeData()); const QFileInfo fi = CGuiUtility::representedMimeFile(event->mimeData());
const CStatusMessage msgs = this->loadJsonFile(fi.absoluteFilePath()); const CStatusMessage msgs = this->loadJsonFile(fi.absoluteFilePath());
Q_UNUSED(msgs); Q_UNUSED(msgs)
return; return;
} }
CViewBaseNonTemplate::dropEvent(event); CViewBaseNonTemplate::dropEvent(event);
@@ -632,7 +632,7 @@ namespace BlackGui
Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed");
c = connect(m_model, &ModelClass::changed, this, &CViewBase::onModelChanged); c = connect(m_model, &ModelClass::changed, this, &CViewBase::onModelChanged);
Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed");
Q_UNUSED(c); Q_UNUSED(c)
} }
this->setModel(m_model); // via QTableView this->setModel(m_model); // via QTableView
@@ -684,8 +684,8 @@ namespace BlackGui
void CViewBase<T>::mouseOverCallback(const QModelIndex &index, bool mouseOver) void CViewBase<T>::mouseOverCallback(const QModelIndex &index, bool mouseOver)
{ {
// void // void
Q_UNUSED(index); Q_UNUSED(index)
Q_UNUSED(mouseOver); Q_UNUSED(mouseOver)
} }
template <class T> template <class T>
@@ -697,13 +697,13 @@ namespace BlackGui
template <class T> template <class T>
void CViewBase<T>::selectObjects(const ContainerType &selectedObjects) void CViewBase<T>::selectObjects(const ContainerType &selectedObjects)
{ {
Q_UNUSED(selectedObjects); Q_UNUSED(selectedObjects)
} }
template <class T> template <class T>
CStatusMessage CViewBase<T>::modifyLoadedJsonData(ContainerType &data) const CStatusMessage CViewBase<T>::modifyLoadedJsonData(ContainerType &data) const
{ {
Q_UNUSED(data); Q_UNUSED(data)
static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"no modification", true); static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"no modification", true);
return e; return e;
} }
@@ -711,7 +711,7 @@ namespace BlackGui
template <class T> template <class T>
CStatusMessage CViewBase<T>::validateLoadedJsonData(const ContainerType &data) const CStatusMessage CViewBase<T>::validateLoadedJsonData(const ContainerType &data) const
{ {
Q_UNUSED(data); Q_UNUSED(data)
static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"validation passed", true); static const CStatusMessage e(this, CStatusMessage::SeverityInfo, u"validation passed", true);
return e; return e;
} }
@@ -719,7 +719,7 @@ namespace BlackGui
template <class T> template <class T>
void CViewBase<T>::jsonLoadedAndModelUpdated(const ContainerType &data) void CViewBase<T>::jsonLoadedAndModelUpdated(const ContainerType &data)
{ {
Q_UNUSED(data); Q_UNUSED(data)
} }
template<class T> template<class T>
@@ -890,7 +890,7 @@ namespace BlackGui
} }
catch (const CJsonException &ex) catch (const CJsonException &ex)
{ {
Q_UNUSED(ex); Q_UNUSED(ex)
} }
} }