Skip to content

Commit c945972

Browse files
authored
Rerun formatting with rules missing from previous run (#513)
1 parent 278c4c7 commit c945972

File tree

137 files changed

+2062
-1978
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2062
-1978
lines changed

IbisHardwareIGSIO/ibishardwareIGSIO.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ void IbisHardwareIGSIO::AssignDeviceImageToTool( igtlioDevicePointer device, Too
459459
{
460460
imageContent = imageDev->GetContent().image;
461461
// OpenIGTLink specifications has origin as center of image
462-
double origin[3] = {0., 0., 0.};
462+
double origin[3] = { 0., 0., 0. };
463463
imageContent->SetOrigin( origin );
464464
}
465465
}

IbisLib/abstractpolydataobject.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void AbstractPolyDataObject::Serialize( Serializer * ser )
9898
{
9999
double opacity = this->GetOpacity();
100100
double * objectColor = this->GetColor();
101-
int clippingPlaneOrientation[3] = {1, 1, 1};
101+
int clippingPlaneOrientation[3] = { 1, 1, 1 };
102102
if( !ser->IsReader() )
103103
{
104104
clippingPlaneOrientation[0] = GetClippingPlanesOrientation( 0 ) ? 1 : 0;
@@ -250,7 +250,7 @@ void AbstractPolyDataObject::SetClippingPlanesOrientation( int plane, bool posit
250250
{
251251
Q_ASSERT( plane >= 0 && plane < 3 );
252252
vtkDoubleArray * normals = vtkDoubleArray::SafeDownCast( m_clippingPlanes->GetNormals() );
253-
double tuple[3] = {0.0, 0.0, 0.0};
253+
double tuple[3] = { 0.0, 0.0, 0.0 };
254254
tuple[plane] = positive ? -1.0 : 1.0;
255255
normals->SetTuple( plane, tuple );
256256
m_clippingPlanes->Modified();
@@ -336,7 +336,7 @@ void AbstractPolyDataObject::InternalPostSceneRead()
336336

337337
void AbstractPolyDataObject::UpdateClippingPlanes()
338338
{
339-
double pos[3] = {0.0, 0.0, 0.0};
339+
double pos[3] = { 0.0, 0.0, 0.0 };
340340
GetManager()->GetCursorPosition( pos );
341341
vtkPoints * origins = m_clippingPlanes->GetPoints();
342342
origins->SetPoint( 0, pos[0], 0.0, 0.0 );
@@ -348,7 +348,7 @@ void AbstractPolyDataObject::UpdateClippingPlanes()
348348

349349
void AbstractPolyDataObject::UpdateCuttingPlane()
350350
{
351-
double cursorPos[3] = {0.0, 0.0, 0.0};
351+
double cursorPos[3] = { 0.0, 0.0, 0.0 };
352352
GetManager()->GetCursorPosition( cursorPos );
353353
m_cuttingPlane[0]->SetOrigin( cursorPos[0], 0.0, 0.0 );
354354
m_cuttingPlane[1]->SetOrigin( 0.0, cursorPos[1], 0.0 );

IbisLib/cameraobject.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void CameraIntrinsicParams::SetVerticalAngleRad( double angle )
109109
// CameraObject class implementation
110110
//---------------------------------------------------------------------------------------
111111

112-
static int DefaultImageSize[2] = {640, 480};
112+
static int DefaultImageSize[2] = { 640, 480 };
113113

114114
CameraObject::CameraObject()
115115
{
@@ -813,13 +813,13 @@ void CameraObject::WorldToImage( double * worldPos, double & xIm, double & yIm )
813813
vtkMatrix4x4 * mat = vtkMatrix4x4::New();
814814
mat->DeepCopy( m_opticalCenterTransform->GetMatrix() );
815815
mat->Invert();
816-
double pCam[4] = {0.0, 0.0, 0.0, 1.0};
816+
double pCam[4] = { 0.0, 0.0, 0.0, 1.0 };
817817
mat->MultiplyPoint( p4, pCam );
818818
mat->Delete();
819819

820-
double centerPix[2] = {0.0, 0.0};
820+
double centerPix[2] = { 0.0, 0.0 };
821821
GetImageCenterPix( centerPix[0], centerPix[1] );
822-
double focalPix[2] = {0.0, 0.0};
822+
double focalPix[2] = { 0.0, 0.0 };
823823
GetFocalPix( focalPix[0], focalPix[1] );
824824

825825
xIm = centerPix[0] + pCam[0] / pCam[2] * focalPix[0];
@@ -927,7 +927,7 @@ void CameraObject::DrawRect( double x, double y, double width, double height, do
927927

928928
void CameraObject::DrawTarget( double x, double y, double /*radius*/, double color[4] )
929929
{
930-
double center[3] = {0.0, 0.0, 0.0};
930+
double center[3] = { 0.0, 0.0, 0.0 };
931931
center[0] = x;
932932
center[1] = y;
933933
PerViewElementCont::iterator it = m_perViewElements.begin();
@@ -1099,7 +1099,8 @@ void CameraObject::CreateCameraRepresentation()
10991099
pts->InsertNextPoint( 100.0, 100.0, -m_imageDistance );
11001100
pts->InsertNextPoint( -100.0, 100.0, -m_imageDistance );
11011101

1102-
static vtkIdType linesIndex[8][2] = {{0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 2}, {2, 3}, {3, 4}, {4, 1}};
1102+
static vtkIdType linesIndex[8][2] = { { 0, 1 }, { 0, 2 }, { 0, 3 }, { 0, 4 },
1103+
{ 1, 2 }, { 2, 3 }, { 3, 4 }, { 4, 1 } };
11031104
vtkSmartPointer<vtkCellArray> lines = vtkSmartPointer<vtkCellArray>::New();
11041105
for( int i = 0; i < 8; ++i ) lines->InsertNextCell( 2, linesIndex[i] );
11051106

IbisLib/gui/cameraobjectsettingswidget.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void CameraObjectSettingsWidget::UpdateUI()
115115
ui->fySpinBox->blockSignals( false );
116116

117117
// Image center
118-
double center[2] = {0.0, 0.0};
118+
double center[2] = { 0.0, 0.0 };
119119
m_camera->GetImageCenterPix( center[0], center[1] );
120120

121121
ui->xImageCenterSpinBox->blockSignals( true );
@@ -141,8 +141,8 @@ void CameraObjectSettingsWidget::UpdateUI()
141141
ui->lensDisplacementSpinBox->blockSignals( false );
142142

143143
// Update translation and rotation of calibration matrix
144-
double trans[3] = {0.0, 0.0, 0.0};
145-
double rot[3] = {0.0, 0.0, 0.0};
144+
double trans[3] = { 0.0, 0.0, 0.0 };
145+
double rot[3] = { 0.0, 0.0, 0.0 };
146146
vtkMatrix4x4Operators::MatrixToTransRot( m_camera->GetCalibrationMatrix(), trans, rot );
147147
ui->xtransSpinBox->blockSignals( true );
148148
ui->xtransSpinBox->setValue( trans[0] );

IbisLib/gui/guiutilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ See Copyright.txt or http://ibisneuronav.org/Copyright.html for details.
1111
#ifndef __GuiUtilities_h_
1212
#define __GuiUtilities_h_
1313

14+
#include <QComboBox>
1415
#include <QList>
1516
#include <QMap>
1617
#include <QVariant>
17-
#include <QComboBox>
1818

1919
#include "ibisapi.h"
2020

IbisLib/gui/pointcloudobjectsettingsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void PointCloudObjectSettingsDialog::ColorSwatchClicked()
109109
QColorDialog::getColor( initial, nullptr, tr( "Choose Color" ), QColorDialog::DontUseNativeDialog );
110110
if( newColor.isValid() )
111111
{
112-
double newColorfloat[3] = {1, 1, 1};
112+
double newColorfloat[3] = { 1, 1, 1 };
113113
newColorfloat[0] = double( newColor.red() ) / 255.0;
114114
newColorfloat[1] = double( newColor.green() ) / 255.0;
115115
newColorfloat[2] = double( newColor.blue() ) / 255.0;

IbisLib/gui/pointcolorwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void PointColorWidget::DisabledColorSetButtonClicked()
140140
QString style = QString( "border-width: 2px; border-style: solid; border-radius: 7;" );
141141
styleColor += style;
142142
ui->disabledColorSwatch->setStyleSheet( styleColor );
143-
double newColorfloat[3] = {1, 1, 1};
143+
double newColorfloat[3] = { 1, 1, 1 };
144144
newColorfloat[0] = double( newColor.red() ) / 255.0;
145145
newColorfloat[1] = double( newColor.green() ) / 255.0;
146146
newColorfloat[2] = double( newColor.blue() ) / 255.0;
@@ -160,7 +160,7 @@ void PointColorWidget::EnabledColorSetButtonClicked()
160160
QString style = QString( "border-width: 2px; border-style: solid; border-radius: 7;" );
161161
styleColor += style;
162162
ui->enabledColorSwatch->setStyleSheet( styleColor );
163-
double newColorfloat[3] = {1, 1, 1};
163+
double newColorfloat[3] = { 1, 1, 1 };
164164
newColorfloat[0] = double( newColor.red() ) / 255.0;
165165
newColorfloat[1] = double( newColor.green() ) / 255.0;
166166
newColorfloat[2] = double( newColor.blue() ) / 255.0;
@@ -180,7 +180,7 @@ void PointColorWidget::SelectedColorSetButtonClicked()
180180
QString style = QString( "border-width: 2px; border-style: solid; border-radius: 7;" );
181181
styleColor += style;
182182
ui->selectedColorSwatch->setStyleSheet( styleColor );
183-
double newColorfloat[3] = {1, 1, 1};
183+
double newColorfloat[3] = { 1, 1, 1 };
184184
newColorfloat[0] = double( newColor.red() ) / 255.0;
185185
newColorfloat[1] = double( newColor.green() ) / 255.0;
186186
newColorfloat[2] = double( newColor.blue() ) / 255.0;
@@ -200,7 +200,7 @@ void PointColorWidget::LineColorSetButtonClicked()
200200
QString style = QString( "border-width: 2px; border-style: solid; border-radius: 7;" );
201201
styleColor += style;
202202
ui->lineColorSwatch->setStyleSheet( styleColor );
203-
double newColorfloat[3] = {1, 1, 1};
203+
double newColorfloat[3] = { 1, 1, 1 };
204204
newColorfloat[0] = double( newColor.red() ) / 255.0;
205205
newColorfloat[1] = double( newColor.green() ) / 255.0;
206206
newColorfloat[2] = double( newColor.blue() ) / 255.0;

IbisLib/gui/polydataobjectsettingsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void PolyDataObjectSettingsDialog::ColorSwatchClicked()
217217
QColorDialog::getColor( initial, nullptr, tr( "Choose Color" ), QColorDialog::DontUseNativeDialog );
218218
if( newColor.isValid() )
219219
{
220-
double newColorfloat[3] = {1, 1, 1};
220+
double newColorfloat[3] = { 1, 1, 1 };
221221
newColorfloat[0] = double( newColor.red() ) / 255.0;
222222
newColorfloat[1] = double( newColor.green() ) / 255.0;
223223
newColorfloat[2] = double( newColor.blue() ) / 255.0;

IbisLib/gui/quadviewwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ See Copyright.txt or http://ibisneuronav.org/Copyright.html for details.
3838

3939
ObjectSerializationMacro( QuadViewWindow );
4040

41-
const QString QuadViewWindow::ViewNames[4] = {"Transverse", "ThreeD", "Coronal", "Sagittal"};
41+
const QString QuadViewWindow::ViewNames[4] = { "Transverse", "ThreeD", "Coronal", "Sagittal" };
4242

4343
QuadViewWindow::QuadViewWindow( QWidget * parent, Qt::WindowFlags fl ) : QWidget( parent, fl )
4444
{

IbisLib/gui/tractogramobjectsettingsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void TractogramObjectSettingsDialog::ColorSwatchClicked()
217217
QColor newColor = QColorDialog::getColor( initial );
218218
if( newColor.isValid() )
219219
{
220-
double newColorfloat[3] = {1, 1, 1};
220+
double newColorfloat[3] = { 1, 1, 1 };
221221
newColorfloat[0] = double( newColor.red() ) / 255.0;
222222
newColorfloat[1] = double( newColor.green() ) / 255.0;
223223
newColorfloat[2] = double( newColor.blue() ) / 255.0;

0 commit comments

Comments
 (0)