Skip to content

Commit

Permalink
Refs #6347. Remove dead code and add documentation.
Browse files Browse the repository at this point in the history
(cherry picked from commit d5695312d56ee557b80dffb6711c78112acd856b)
  • Loading branch information
Michael Reuter committed Jan 16, 2013
1 parent 8bdba79 commit b78e922
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class EXPORT_OPT_MANTIDVATES_SIMPLEGUI_VIEWWIDGETS MultiSliceView : public ViewB
void resetDisplay();

protected slots:
///
/// Determine if slice is to be shown in SliceViewer.
void checkSliceClicked(int axisIndex, double sliceOffsetOnAxis,
int button, int modifier);
/// Launch SliceViewer with the specified cut.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ void MultiSliceView::resetCamera()

/**
* This function checks the signal coming from the MultiSliceView when a slice
* indicator is clicked.
* indicator is clicked. It then calls for the slice to be shown in the
* SliceViewer.
* @param axisIndex : index for the axis on which the clicked indicator resides
* @param sliceOffsetOnAxis : location of slice along axis
* @param button : which mouse button is being used
Expand Down Expand Up @@ -132,6 +133,7 @@ void MultiSliceView::checkSliceViewCompat()
* representation of the current dataset and cut parameters. That will then
* be handed to the SliceViewer.
* @param axisIndex the index of the slice to be opened in SliceViewer
* @param sliceOffsetOnAxis position of the slice along given axis
*/
void MultiSliceView::showCutInSliceViewer(int axisIndex,
double sliceOffsetOnAxis)
Expand Down Expand Up @@ -171,18 +173,9 @@ void MultiSliceView::showCutInSliceViewer(int axisIndex,
geomXML = std::string(inGeomXML);
}

// Get the necessary information from the cut
// 10/01/2013 Cannot use the GetSliceOrigin due to bug in ParaView
// which only returns (0, 0, 0) from the function call.
/*
const double *origin = this->mainView->GetSliceOrigin(axisIndex);
std::cout << "(" << origin[0] << ", " << origin[1] << ", ";
std::cout << origin[2] << ")" << std::endl;
*/

const double *orient = this->mainView->GetSliceNormal(axisIndex);

// Construct origin vector from orientation vector due to ParaView bug
// Construct origin vector from orientation vector
double origin[3];
origin[0] = sliceOffsetOnAxis * orient[0];
origin[1] = sliceOffsetOnAxis * orient[1];
Expand Down

0 comments on commit b78e922

Please sign in to comment.