Skip to content

Commit

Permalink
Refs #3868. Fixing cppcheck warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Reuter committed Jan 6, 2012
1 parent b437075 commit 7327038
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ColorMapWidget.cpp
View file
Expand Up @@ -228,7 +228,7 @@ void ColorMapWidget::mousePressEvent(QMouseEvent* e)
{
m_dragging = true;
m_y = e->y();
m_dtype = m_y > height()/2 ? Bottom : Top;
m_dtype = (m_y > height()/2) ? Bottom : Top;
QApplication::setOverrideCursor(Qt::ClosedHandCursor);
}
}
Expand Down
3 changes: 1 addition & 2 deletions Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/GLTrackball.cpp
View file
Expand Up @@ -75,11 +75,10 @@ void GLTrackball::initZoomFrom(int a,int b)

void GLTrackball::generateZoomTo(int a, int b)
{
double x,y=0;
double y=0;
int _viewport_w, _viewport_h;
_viewport->getViewport(&_viewport_w,&_viewport_h);
if(a>=_viewport_w || b>=_viewport_h||a <= 0||b<=0)return;
x=static_cast<double>((_viewport_w-a));
y=static_cast<double>((b-_viewport_h));
if(y==0) y=_lastpoint[1];
double diff= _lastpoint[1]/y ;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentActor.cpp
View file
Expand Up @@ -28,7 +28,7 @@ double InstrumentActor::m_tolerance = 0.00001;
* Constructor
* @param wsName :: Workspace
*/
InstrumentActor::InstrumentActor(const QString wsName):
InstrumentActor::InstrumentActor(const QString &wsName):
m_workspace(boost::dynamic_pointer_cast<MatrixWorkspace>(AnalysisDataService::Instance().retrieve(wsName.toStdString()))),
m_autoscaling(true),
m_maskedColor(100,100,100),
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentActor.h
View file
Expand Up @@ -67,7 +67,7 @@ class InstrumentActor: public QObject, public GLActor
{
Q_OBJECT
public:
InstrumentActor(const QString wsName); ///< Constructor
InstrumentActor(const QString &wsName); ///< Constructor
~InstrumentActor(); ///< Destructor
virtual std::string type()const {return "InstrumentActor";} ///< Type of the GL object
void draw(bool picking = false)const;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/XIntegrationControl.cpp
View file
Expand Up @@ -62,7 +62,7 @@ void XIntegrationScrollBar::mouseMoveEvent (QMouseEvent* e)
*/
bool XIntegrationScrollBar::eventFilter(QObject *object, QEvent *e)
{
QPushButton* slider = (QPushButton*)object;
QPushButton* slider = dynamic_cast<QPushButton*>(object);
if (!slider) return false;
if( e->type() == QEvent::Leave)
{
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp
View file
Expand Up @@ -988,7 +988,7 @@ void MantidDockWidget::deleteWorkspaces()
QList<QTreeWidgetItem*> items = m_tree->selectedItems();
if(items.empty())
{
MantidMatrix* m = (MantidMatrix*) m_mantidUI->appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(m_mantidUI->appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
if(m->workspaceName().isEmpty()) return;

Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/MantidMDCurve.cpp
View file
Expand Up @@ -67,7 +67,7 @@ void MantidMDCurve::init(Graph* g, bool distr, Graph::CurveType style)
setData(data);

int lineWidth = 1;
MultiLayer* ml = (MultiLayer*)(g->parent()->parent()->parent());
MultiLayer* ml = dynamic_cast<MultiLayer*>(g->parent()->parent()->parent());
if (style == Graph::Unspecified || (ml && ml->applicationWindow()->applyCurveStyleToMantid) )
{
applyStyleChoice(style, ml, lineWidth);
Expand Down
14 changes: 7 additions & 7 deletions Code/Mantid/MantidPlot/src/Mantid/MantidMatrix.cpp
View file
Expand Up @@ -1045,18 +1045,18 @@ void MantidMatrix::removeWindow()
foreach(MdiSubWindow *w, windows){
//if (w->isA("Graph3D") && ((Graph3D*)w)->userFunction()->hlpFun() == &m_funct)
if (w->isA("Graph3D") )//&& ((Graph3D*)w)->userFunction()->hlpFun() == &m_funct)
{ UserFunction* fn=((Graph3D*)w)->userFunction();
{ UserFunction* fn=(dynamic_cast<Graph3D*>(w))->userFunction();
if(fn)
{ if(fn->hlpFun() == &m_funct)((Graph3D*)w)->clearData();
{ if(fn->hlpFun() == &m_funct)(dynamic_cast<Graph3D*>(w))->clearData();
}

}else if (w->isA("Table")){
}
else if (w->isA("MultiLayer")){
QList<Graph *> layers = ((MultiLayer*)w)->layersList();
QList<Graph *> layers = (dynamic_cast<MultiLayer*>(w))->layersList();
foreach(Graph *g, layers){
for (int i=0; i<g->curves(); i++){
Spectrogram *sp = (Spectrogram *)g->plotItem(i);
Spectrogram *sp = dynamic_cast<Spectrogram *>(g->plotItem(i));
if (sp && sp->rtti() == QwtPlotItem::Rtti_PlotSpectrogram && sp->funct() == &m_funct)
g->removeCurve(i);
}
Expand Down Expand Up @@ -1128,7 +1128,7 @@ void MantidMatrix::dependantClosed(MdiSubWindow* w)
QMap<MultiLayer*,Table*>::iterator itr;
for( itr = m_plots1D.begin(); itr != m_plots1D.end(); ++itr )
{
if( itr.value() == (Table*)w )
if( itr.value() == dynamic_cast<Table*>(w) )
{
m_plots1D.erase(itr);
break;
Expand All @@ -1137,10 +1137,10 @@ void MantidMatrix::dependantClosed(MdiSubWindow* w)
}
else if (w->isA("MultiLayer"))
{
int i = m_plots2D.indexOf((MultiLayer*)w);
int i = m_plots2D.indexOf(dynamic_cast<MultiLayer*>(w));
if (i >= 0)m_plots2D.remove(i);
else
{QMap<MultiLayer*,Table*>::iterator i = m_plots1D.find((MultiLayer*)w);
{QMap<MultiLayer*,Table*>::iterator i = m_plots1D.find(dynamic_cast<MultiLayer*>(w));
if (i != m_plots1D.end())
{
if (i.value() != 0)
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.cpp
View file
Expand Up @@ -114,7 +114,7 @@ void MantidMatrixCurve::init(Graph* g,bool distr,Graph::CurveType style)
m_yUnits.reset(new Mantid::Kernel::Units::Empty());
}
int lineWidth = 1;
MultiLayer* ml = (MultiLayer*)(g->parent()->parent()->parent());
MultiLayer* ml = dynamic_cast<MultiLayer*>(g->parent()->parent()->parent());
if (style == Graph::Unspecified || (ml && ml->applicationWindow()->applyCurveStyleToMantid) )
{
applyStyleChoice(style, ml, lineWidth);
Expand Down
29 changes: 14 additions & 15 deletions Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
View file
Expand Up @@ -800,63 +800,63 @@ void MantidUI::showContextMenu(QMenu& cm, MdiSubWindow* w)

void MantidUI::copyRowToTable()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
Table* t = createTableFromSelectedRows(m,true,true);
t->showNormal();
}

void MantidUI::copyColumnToTable()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
Table* t = createTableFromSelectedColumns(m,true);
t->showNormal();
}

void MantidUI::copyRowToGraph()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
plotSelectedRows(m,false);

}

void MantidUI::copyColumnToGraph()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
createGraphFromSelectedColumns(m,false);

}

void MantidUI::copyColumnToGraphErr()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
createGraphFromSelectedColumns(m,true);

}

void MantidUI::copyRowToGraphErr()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
plotSelectedRows(m,true);

}

void MantidUI::copyRowsToWaterfall()
{
const MantidMatrix* const m = (MantidMatrix*)appWindow()->activeWindow();
const MantidMatrix* const m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
MultiLayer* ml = plotSelectedRows(m,false);
if (ml) convertToWaterfall(ml);
}

void MantidUI::plotWholeAsWaterfall()
{
const MantidMatrix* const m = (MantidMatrix*)appWindow()->activeWindow();
const MantidMatrix* const m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
MultiLayer* ml = plotSpectraRange(m->workspaceName(),0,m->numRows()-1,false);
if (ml) convertToWaterfall(ml);
Expand All @@ -875,14 +875,14 @@ void MantidUI::convertToWaterfall(MultiLayer* ml)

void MantidUI::copyDetectorsToTable()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
createTableDetectors(m);
}

void MantidUI::copyValues()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix")) return;
m->copySelection();
}
Expand Down Expand Up @@ -1836,7 +1836,7 @@ void MantidUI::showMantidInstrument(const QString& wsName)

void MantidUI::showMantidInstrument()
{
MantidMatrix* m = (MantidMatrix*)appWindow()->activeWindow();
MantidMatrix* m = dynamic_cast<MantidMatrix*>(appWindow()->activeWindow());
if (!m || !m->isA("MantidMatrix"))
return;
if(!m->workspaceName().isEmpty())
Expand Down Expand Up @@ -2314,7 +2314,7 @@ void MantidUI::importNumSeriesLog(const QString &wsName, const QString &logname,

//Get the starting time of the log.
Mantid::Kernel::DateAndTime startTime;
if (time_value_map.size() > 0)
if (!time_value_map.empty())
{
startTime = ws->run().startTime();
}
Expand Down Expand Up @@ -2465,7 +2465,7 @@ void MantidUI::importNumSeriesLog(const QString &wsName, const QString &logname,
if (useAbsoluteDate)
{
//Convert time into string
std::string time_string = lastTime.to_simple_string();
time_string = lastTime.to_simple_string();
}
else
{
Expand Down Expand Up @@ -2712,10 +2712,9 @@ MultiLayer* MantidUI::createGraphFromTable(Table* t, int type)
//remove the X names from the column list and pass the X removed list
//to multilayerPlot
QString str=(*itr);
int index=0;
if(str.contains("XS",Qt::CaseInsensitive))
{
index=lst.indexOf(str);
int index=lst.indexOf(str);
lst.removeAt(index);
}
}
Expand Down

0 comments on commit 7327038

Please sign in to comment.