From 823bacab0edb6b1cee7acc0fcc0e54fe03640065 Mon Sep 17 00:00:00 2001 From: szeli1 <143485814+szeli1@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:57:22 +0200 Subject: [PATCH] VectorGraphView_fixing_casting --- include/VectorGraphView.h | 6 +++--- src/gui/widgets/VectorGraphView.cpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/VectorGraphView.h b/include/VectorGraphView.h index 9a4c8200dd3..1ef88b123c8 100644 --- a/include/VectorGraphView.h +++ b/include/VectorGraphView.h @@ -156,7 +156,7 @@ protected slots: void processControlWindowPressed(int mouseX, int mouseY, bool isDragging, bool startMoving); // returns -1 if no control / input was clicked // returns displayed absolute control / input location based on inputCount - int getPressedControlInput(int mouseX, int mouseY, unsigned int controlCount); + int getPressedControlInput(int mouseX, int mouseY, size_t controlCount); // returns a float attrib value float getInputAttribValue(unsigned int controlArrayLocation); // sets the selected point's attrib (controlArrayLocation) to floatValue @@ -208,8 +208,8 @@ protected slots: unsigned int m_graphHeight; unsigned int m_controlHeight; - // displayed control count (+1 because of the ">>" button in editing mode) - unsigned int m_controlDisplayCount; + // displayed control count + size_t m_controlDisplayCount; bool m_isEditingActive; const std::array m_controlText = { diff --git a/src/gui/widgets/VectorGraphView.cpp b/src/gui/widgets/VectorGraphView.cpp index b55a13df3a7..6ebc2491f98 100644 --- a/src/gui/widgets/VectorGraphView.cpp +++ b/src/gui/widgets/VectorGraphView.cpp @@ -715,7 +715,7 @@ void VectorGraphView::paintEditing(QPainter* p) foreColor = *dataArray->getFillColor(); } - int controlTextCount = m_controlText.size(); + size_t controlTextCount = m_controlText.size(); int segmentLength = width() / (m_controlDisplayCount); // draw inputs @@ -730,7 +730,7 @@ void VectorGraphView::paintEditing(QPainter* p) // draw outline p->setPen(QPen(*dataArray->getLineColor(), 1)); p->drawLine(0, m_graphHeight, width(), m_graphHeight); - for (unsigned int i = 1; i < m_controlDisplayCount; i++) + for (size_t i = 1; i < m_controlDisplayCount; i++) { if (i < controlTextCount || i >= m_controlDisplayCount) { @@ -941,14 +941,14 @@ void VectorGraphView::processControlWindowPressed(int mouseX, int mouseY, bool i } } } -int VectorGraphView::getPressedControlInput(int mouseX, int mouseY, unsigned int controlCount) +int VectorGraphView::getPressedControlInput(int mouseX, int mouseY, size_t controlCount) { int output = -1; - if (m_isEditingActive == true && mouseY > m_graphHeight) + if (m_isEditingActive == true && mouseY > static_cast(m_graphHeight)) { output = mouseX * controlCount / width(); } - if (output > controlCount) + if (output > static_cast(controlCount)) { output = controlCount; } @@ -1217,7 +1217,7 @@ int VectorGraphView::searchForData(int mouseX, int mouseY, float maxDistance, Ve { curvedBefore = 1; } - if (location - curvedBefore < dataArray->size() - 1) + if (location - curvedBefore < static_cast(dataArray->size()) - 1) { PointF curvedDataCoords = mapDataCurvePosF( dataArray->getX(location - curvedBefore), dataArray->getY(location - curvedBefore), @@ -1257,7 +1257,7 @@ int VectorGraphView::searchForData(int mouseX, int mouseY, float maxDistance, Ve } } // getting where the search needs to end - for (int i = location - curvedBefore + 1; i < dataArray->size(); i++) + for (int i = location - curvedBefore + 1; i < static_cast(dataArray->size()); i++) { if (std::abs(dataArray->getX(i) - transformedMouse.first) > maxDistance) { @@ -1274,7 +1274,7 @@ int VectorGraphView::searchForData(int mouseX, int mouseY, float maxDistance, Ve dataY = dataArray->getY(i); if (isCurved == true && dataArray->size() > 1) { - if (dataArray->size() - 1 > i) + if (static_cast(dataArray->size()) - 1 > i) { PointF curvedDataCoords = mapDataCurvePosF( dataArray->getX(i), dataArray->getY(i), dataArray->getX(i + 1), dataArray->getY(i + 1),