Commit bd4514f8 authored by bonnell's avatar bonnell
Browse files

Add missing project files, remove 'unreferenced variable' warnings.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7595 18c085ea-50e0-402c-830e-de6fd14e8384
parent afcd6fb8
......@@ -46,6 +46,7 @@
#include <string>
#include <cstring>
#include <limits>
#include <algorithm>
#include <vtkFieldData.h>
#include <vtkCellData.h>
......@@ -1973,7 +1974,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
const char particlesGroupName[] = "/particles/";
const char posVarname[] = "position_x";
char datasetname[strlen(particlesGroupName)+strlen(posVarname)+1];
char *datasetname = new char[strlen(particlesGroupName)+strlen(posVarname)+1];
std::strcpy(datasetname, particlesGroupName);
std::strcat(datasetname, posVarname);
......@@ -2029,6 +2030,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
else
{
delete[] xPos;
delete[] datasetname;
H5Dclose(dataSet);
H5Fclose(file_handle);
file_handle = -1;
......@@ -2041,6 +2043,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
else
{
delete[] xPos;
delete[] datasetname;
H5Dclose(dataSet);
H5Fclose(file_handle);
file_handle = -1;
......@@ -2051,6 +2054,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
else
{
delete[] xPos;
delete[] datasetname;
EXCEPTION1(InvalidDBTypeException, "Cannot open y coordinate data set!");
}
......@@ -2076,6 +2080,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
{
delete[] xPos;
delete[] yPos;
delete[] datasetname;
H5Dclose(dataSet);
H5Fclose(file_handle);
file_handle = -1;
......@@ -2089,6 +2094,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
{
delete[] xPos;
delete[] yPos;
delete[] datasetname;
H5Dclose(dataSet);
H5Fclose(file_handle);
file_handle = -1;
......@@ -2100,6 +2106,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
{
delete[] xPos;
delete[] yPos;
delete[] datasetname;
EXCEPTION1(InvalidDBTypeException, "Cannot open z coordinate data set!");
}
}
......@@ -2117,6 +2124,7 @@ avtChomboFileFormat::GetMesh(int patch, const char *meshname)
delete[] xPos;
delete[] yPos;
delete[] zPos;
delete[] datasetname;
//
// Create a vtkUnstructuredGrid to contain the point cells.
......@@ -2391,10 +2399,6 @@ avtChomboFileFormat::GetVar(int patch, const char *varname)
{
if (hasParticles)
{
const char particlesGroupName[] = "/particles/";
char datasetname[strlen(particlesGroupName)+strlen(varname)+1];
std::strcpy(datasetname, particlesGroupName);
std::strcat(datasetname, varname);
if (file_handle < 0)
{
file_handle = H5Fopen(filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT);
......@@ -2405,8 +2409,13 @@ avtChomboFileFormat::GetVar(int patch, const char *varname)
}
}
const char particlesGroupName[] = "/particles/";
char *datasetname = new char[strlen(particlesGroupName)+strlen(varname)+1];
std::strcpy(datasetname, particlesGroupName);
std::strcat(datasetname, varname);
hsize_t nParticles = 0;
hid_t dataSet = H5Dopen(file_handle, datasetname);
delete[] datasetname;
if ( dataSet > 0)
{
hid_t dataSpace = H5Dget_space(dataSet);
......@@ -2450,6 +2459,7 @@ avtChomboFileFormat::GetVar(int patch, const char *varname)
EXCEPTION1(InvalidVariableException, varname);
}
}
return NULL;
}
// ****************************************************************************
......
......@@ -638,7 +638,7 @@ QvisClipWindow::UpdateWindow(bool doAll)
void
QvisClipWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
// Do plane1Origin
if(which_widget == ClipAttributes::ID_plane1Origin || doAll)
......
......@@ -194,7 +194,7 @@ QvisConnCompReduceWindow::UpdateWindow(bool doAll)
void
QvisConnCompReduceWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
QString msg, temp;
// Do target
......
......@@ -257,7 +257,7 @@ QvisContextWindow::UpdateWindow(bool doAll)
void
QvisContextWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
QString msg, temp;
// Do offset
......
......@@ -432,7 +432,7 @@ QvisIsosurfaceWindow::ProcessSelectByText()
void
QvisIsosurfaceWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
// Dp the steby line edit.
if(which_widget == 0 || doAll)
......
......@@ -242,7 +242,7 @@ REQUIRED=BoundaryOp Box Clip Cone CoordSwap CracksClipper CreateBonds Cylinder \
Edge Elevate ExternalSurface \
IndexSelect InverseGhostZone Isosurface Isovolume Lineout Merge OnionPeel \
PDF PersistentParticles Project Reflect Replicate Resample Revolve Slice Smooth \
SphereSlice ThreeSlice Threshold Transform TriangulateRegPoints \
SphereSlice ThreeSlice Threshold Transform TriangulateRegularPoints \
Tube ZoneDump
# The following is a minimal subset of the OPTIONAL/REQUIRED plugins
......
......@@ -352,7 +352,7 @@ QvisOnionPeelWindow::UpdateWindow(bool doAll)
void
QvisOnionPeelWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
QString msg, temp;
// Do categoryName && subsetName
......
......@@ -442,7 +442,7 @@ QvisReflectWindow::UpdateOctantMenuContents()
void
QvisReflectWindow::GetCurrentValues(int which_field)
{
bool okay, doAll = (which_field == -1);
bool doAll = (which_field == -1);
QString msg, temp;
// Do specifiedX
......
......@@ -598,8 +598,6 @@ QvisThresholdWindow::PopulateThresholdVariablesList()
int guiVarNum = 0;
int curVarNum;
char listVarText[21];
if (threshVars->rowCount() != guiVarCount)
{
debug3 << "QTW/PTVL/1: Threshold GUI out of sync with internal data."
......
......@@ -187,7 +187,6 @@ void
QvisTraceHistoryWindow::UpdateWindow(bool doAll)
{
QString temp;
char str[1024];
for(int i = 0; i < atts->NumAttributes(); ++i)
{
......@@ -249,7 +248,7 @@ QvisTraceHistoryWindow::UpdateWindow(bool doAll)
void
QvisTraceHistoryWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
QString msg, temp;
// Do exprs
......
......@@ -674,7 +674,7 @@ QvisMoleculePlotWindow::UpdateWindow(bool doAll)
void
QvisMoleculePlotWindow::GetCurrentValues(int which_widget)
{
bool okay, doAll = (which_widget == -1);
bool doAll = (which_widget == -1);
QString msg, temp;
// Do radiusScaleFactor
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment