jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
jfmcarreira
2021-11-27 00:52:32 +00:00
parent 1bb2773abc
commit f3df40cdf7
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-tidy
+3 -1
View File
@@ -1,5 +1,5 @@
---
Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-non-private-member-variables-in-classes, -cppcoreguidelines-owning-memory, -cppcoreguidelines-pro-bounds-constant-array-index'
Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-non-private-member-variables-in-classes, -cppcoreguidelines-owning-memory, -cppcoreguidelines-pro-bounds-constant-array-index, -readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers'
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
@@ -41,3 +41,5 @@ CheckOptions:
value: '0'
- key: google-readability-function-size.StatementThreshold
value: '800'
- key: readability-magic-numbers.IgnorePowersOf2IntegerValues
value: '1'
app/VideoSubWindow.cpp
+7 -13
View File
@@ -396,7 +396,7 @@ QSize VideoSubWindow::getScrollSize()
return QSize( m_pcScrollArea->viewport()->size().width() - 5, m_pcScrollArea->viewport()->size().height() - 5 );
}
void VideoSubWindow::adjustScrollBarToRatio( const double& horRatio, const double& verRatio )
void VideoSubWindow::adjustScrollBarToRatio( const double horRatio, const double verRatio )
{
QScrollBar* scrollBarH = m_pcScrollArea->horizontalScrollBar();
QScrollBar* scrollBarV = m_pcScrollArea->verticalScrollBar();
@@ -500,12 +500,11 @@ void VideoSubWindow::zoomToFactor( double factor, QPoint center )
void VideoSubWindow::scaleView( double scale, QPoint center )
{
Q_ASSERT( !m_cViewArea->image().isNull() );
if( scale != 1.0 )
{
double usedScale = m_cViewArea->scaleZoomFactor( scale, center, getScrollSize() );
adjustScrollBarByScale( usedScale, center );
}
if( scale == 1.0 )
return;
double usedScale = m_cViewArea->scaleZoomFactor( scale, center, getScrollSize() );
adjustScrollBarByScale( usedScale, center );
}
void VideoSubWindow::scaleView( const QSize& size, QPoint center )
@@ -521,12 +520,7 @@ void VideoSubWindow::scaleView( const QSize& size, QPoint center )
// Calc the zoom factor
double wfactor = (double)newSize.width() / imgViewSize.width();
double hfactor = (double)newSize.height() / imgViewSize.height();
double factor{ wfactor };
if( wfactor < hfactor )
factor = wfactor;
else
factor = hfactor;
auto factor = std::min( wfactor, hfactor );
double curFactor = getScaleFactor();
if( factor != curFactor )
app/VideoSubWindow.h
+3 -3
View File
@@ -135,7 +135,7 @@ public:
void setFillWindow( bool bFlag );
void adjustScrollBarToRatio( const double& horRatio, const double& verRatio );
void adjustScrollBarToRatio( const double horRatio, const double verRatio );
private:
bool hasRunningModule();
@@ -177,8 +177,8 @@ protected:
private:
QScrollArea* m_pcScrollArea;
QPoint m_cCurrScroll;
double m_dHorScroll;
double m_dVerScroll;
double m_dHorScroll{ 0 };
double m_dVerScroll{ 0 };
ViewArea* m_cViewArea;
QRect m_cSelectedArea;
VideoSubWindow* m_pcReferenceSubWindow;