Commit cd15b2bb authored by bonnell's avatar bonnell

Added 'C' files for avtMultiresSelection (to fix link errors) and...

Added 'C' files for avtMultiresSelection (to fix link errors) and avtResolutionSelection (for consistency, added PIPELINE_API).
Made avtMultiresSelection::DescriptionString return a value.
Added config-site file for my personal win8 machine.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22547 18c085ea-50e0-402c-830e-de6fd14e8384
parent be3094cd
......@@ -99,6 +99,7 @@ Data/avtMaterial.C
Data/avtMaximumIntensityProjectionRF.C
Data/avtMetaData.C
Data/avtMixedVariable.C
Data/avtMultiresSelection.C
Data/avtNullData.C
Data/avtOpacityMap.C
Data/avtOpacityMapSamplePointArbitrator.C
......@@ -114,6 +115,7 @@ Data/avtRay.C
Data/avtRayFunction.C
Data/avtRelativeValueSamplePointArbitrator.C
Data/avtResampleSelection.C
Data/avtResolutionSelection.C
Data/avtSamplePointArbitrator.C
Data/avtSamplePoints.C
Data/avtSpatialBoxSelection.C
......
/*****************************************************************************
*
* Copyright (c) 2000 - 2013, Lawrence Livermore National Security, LLC
* Produced at the Lawrence Livermore National Laboratory
* LLNL-CODE-442911
* All rights reserved.
*
* This file is part of VisIt. For details, see https://visit.llnl.gov/. The
* full copyright notice is contained in the file COPYRIGHT located at the root
* of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the disclaimer below.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the disclaimer (as noted below) in the
* documentation and/or other materials provided with the distribution.
* - Neither the name of the LLNS/LLNL nor the names of its contributors may
* be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY,
* LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
* DAMAGE.
*
*****************************************************************************/
#include "avtMultiresSelection.h"
std::string
avtMultiresSelection::DescriptionString()
{
char str[1024];
sprintf(str,
"avtMultiresSelection:%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f",
desiredFrustum[0], desiredFrustum[1],
desiredFrustum[2], desiredFrustum[3],
desiredFrustum[4], desiredFrustum[5],
actualFrustum[0], actualFrustum[1],
actualFrustum[2], actualFrustum[3],
actualFrustum[4], actualFrustum[5],
desiredCellSize, actualCellSize);
return std::string(str);
}
void
avtMultiresSelection::SetDesiredFrustum(const double frust[6])
{
desiredFrustum[0] = frust[0];
desiredFrustum[1] = frust[1];
desiredFrustum[2] = frust[2];
desiredFrustum[3] = frust[3];
desiredFrustum[4] = frust[4];
desiredFrustum[5] = frust[5];
}
void
avtMultiresSelection::GetDesiredFrustum(double frust[6]) const
{
frust[0] = desiredFrustum[0];
frust[1] = desiredFrustum[1];
frust[2] = desiredFrustum[2];
frust[3] = desiredFrustum[3];
frust[4] = desiredFrustum[4];
frust[5] = desiredFrustum[5];
}
void
avtMultiresSelection::SetActualFrustum(const double frust[6])
{
actualFrustum[0] = frust[0];
actualFrustum[1] = frust[1];
actualFrustum[2] = frust[2];
actualFrustum[3] = frust[3];
actualFrustum[4] = frust[4];
actualFrustum[5] = frust[5];
}
void
avtMultiresSelection::GetActualFrustum(double frust[6]) const
{
frust[0] = actualFrustum[0];
frust[1] = actualFrustum[1];
frust[2] = actualFrustum[2];
frust[3] = actualFrustum[3];
frust[4] = actualFrustum[4];
frust[5] = actualFrustum[5];
}
......@@ -41,7 +41,7 @@
// ************************************************************************* //
#ifndef AVT_MULTIRES_SELECTION_H
#define AVT_MULTIRES_SELECTION_H
#define AVT_MULTIRES_SELECTION_H
#include <pipeline_exports.h>
#include <ref_ptr.h>
......@@ -58,67 +58,34 @@
// provided.
//
// Programmer: Eric Brugger
// Creation: December 20, 2013
// Creation: December 20, 2013
//
// Modifications:
//
// ****************************************************************************
class PIPELINE_API avtMultiresSelection : public avtDataSelection
class PIPELINE_API avtMultiresSelection : public avtDataSelection
{
public:
avtMultiresSelection() {} ;
virtual ~avtMultiresSelection() {} ;
virtual const char * GetType() const
{ return "Multi Resolution Data Selection"; };
virtual std::string DescriptionString(void)
{ char str[1024];
sprintf(str, "avtMultiresSelection:%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f_%f",
desiredFrustum[0], desiredFrustum[1],
desiredFrustum[2], desiredFrustum[3],
desiredFrustum[4], desiredFrustum[5],
actualFrustum[0], actualFrustum[1],
actualFrustum[2], actualFrustum[3],
actualFrustum[4], actualFrustum[5],
desiredCellSize, actualCellSize); };
{ return "Multi Resolution Data Selection"; }
virtual std::string DescriptionString(void);
void SetDesiredFrustum(const double frust[6])
{ desiredFrustum[0] = frust[0];
desiredFrustum[1] = frust[1];
desiredFrustum[2] = frust[2];
desiredFrustum[3] = frust[3];
desiredFrustum[4] = frust[4];
desiredFrustum[5] = frust[5]; };
void GetDesiredFrustum(double frust[6]) const
{ frust[0] = desiredFrustum[0];
frust[1] = desiredFrustum[1];
frust[2] = desiredFrustum[2];
frust[3] = desiredFrustum[3];
frust[4] = desiredFrustum[4];
frust[5] = desiredFrustum[5]; };
void SetActualFrustum(const double frust[6])
{ actualFrustum[0] = frust[0];
actualFrustum[1] = frust[1];
actualFrustum[2] = frust[2];
actualFrustum[3] = frust[3];
actualFrustum[4] = frust[4];
actualFrustum[5] = frust[5]; };
void GetActualFrustum(double frust[6]) const
{ frust[0] = actualFrustum[0];
frust[1] = actualFrustum[1];
frust[2] = actualFrustum[2];
frust[3] = actualFrustum[3];
frust[4] = actualFrustum[4];
frust[5] = actualFrustum[5]; };
void SetDesiredFrustum(const double frust[6]);
void GetDesiredFrustum(double frust[6]) const;
void SetActualFrustum(const double frust[6]);
void GetActualFrustum(double frust[6]) const;
void SetDesiredCellSize(double size)
{ desiredCellSize = size; };
{ desiredCellSize = size; }
double GetDesiredCellSize() const
{ return desiredCellSize; };
{ return desiredCellSize; }
void SetActualCellSize(double size)
{ actualCellSize = size; };
{ actualCellSize = size; }
double GetActualCellSize() const
{ return actualCellSize; };
{ return actualCellSize; }
private:
double desiredFrustum[6];
......@@ -127,6 +94,6 @@ class PIPELINE_API avtMultiresSelection : public avtDataSelection
double actualCellSize;
};
typedef ref_ptr<avtMultiresSelection> avtMultiresSelectiont_p;
typedef ref_ptr<avtMultiresSelection> avtMultiresSelection_p;
#endif
/*****************************************************************************
*
* Copyright (c) 2010, University of New Hampshire Computer Science Department
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the disclaimer below.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the disclaimer (as noted below) in the
* documentation and/or other materials provided with the distribution.
* - Neither the name of the LLNS/LLNL nor the names of its contributors may
* be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY,
* LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
* DAMAGE.
*
*****************************************************************************/
#include "avtResolutionSelection.h"
// ****************************************************************************
//
// ****************************************************************************
std::string
avtResolutionSelection::DescriptionString()
{
char str[1024];
sprintf(str, "avtResolutionSelection:%d", mResolution);
return std::string(str);
}
......@@ -35,6 +35,7 @@
// ************************************************************************* //
#ifndef _AVT_RESOLUTION_SELECTION_H_
#define _AVT_RESOLUTION_SELECTION_H_
#include <pipeline_exports.h>
#include "avtDataSelection.h"
......@@ -55,16 +56,14 @@
// Add method DescriptionString.
//
// ****************************************************************************
class avtResolutionSelection : public avtDataSelection {
class PIPELINE_API avtResolutionSelection : public avtDataSelection
{
public:
avtResolutionSelection() {}
virtual ~avtResolutionSelection() {}
// base class api
virtual const char* GetType() const { return "avtResolutionSelection"; }
virtual std::string DescriptionString(void)
{ char str[1024];
sprintf(str, "avtResolutionSelection:%d", mResolution);
return std::string(str); };
virtual std::string DescriptionString(void);
// added functionality
virtual void setResolution(int r) { mResolution = r; }
......
include(${VISIT_SOURCE_DIR}/config-site/windows.cmake)
# disable some warnings
# 4244 conversion double to float etc
# 4305 truncation from 'double' to 'float', etc
# 4800 'int' forcing value to bool (performance warning)
#ADD_DEFINITIONS(/wd4244 /wd4305 /wd4800)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_PROFILES_TO_HOSTS "llnl" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_THIRD_PARTY ON TYPE BOOL)
#VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
SET(CMAKE_SUPPRESS_REGENERATION TRUE)
SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE)
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