Commit 879b9025 authored by ghweber's avatar ghweber

Renamed Boundary operator classes to avoid crash on Mac.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@1909 18c085ea-50e0-402c-830e-de6fd14e8384
parent c5955497
<?xml version="1.0"?>
<Plugin name="Boundary" type="operator" label="Boundary" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="Boundary.xpm">
<Plugin name="BoundaryOp" type="operator" label="Boundary" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="BoundaryOp.xpm">
<Attribute name="BoundaryOpAttributes" purpose="Attributes for Boundary Operator" persistent="true" keyframe="true" exportAPI="" exportInclude="">
<Field name="smoothingLevel" label="Smoothing level" type="int">
0
......
/* XPM */
static const char * Boundary_xpm[] = {
static const char * BoundaryOp_xpm[] = {
"32 32 4 1",
" c None",
". c #00FF00",
......
......@@ -50,7 +50,7 @@ const char *BoundaryOpAttributes::TypeMapFormatString = "i";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -71,7 +71,7 @@ BoundaryOpAttributes::BoundaryOpAttributes() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -94,7 +94,7 @@ BoundaryOpAttributes::BoundaryOpAttributes(const BoundaryOpAttributes &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -114,7 +114,7 @@ BoundaryOpAttributes::~BoundaryOpAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -139,7 +139,7 @@ BoundaryOpAttributes::operator = (const BoundaryOpAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -161,7 +161,7 @@ BoundaryOpAttributes::operator == (const BoundaryOpAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -182,7 +182,7 @@ BoundaryOpAttributes::operator != (const BoundaryOpAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -203,7 +203,7 @@ BoundaryOpAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -231,7 +231,7 @@ BoundaryOpAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -257,7 +257,7 @@ BoundaryOpAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -284,7 +284,7 @@ BoundaryOpAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -309,7 +309,7 @@ BoundaryOpAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -351,7 +351,7 @@ BoundaryOpAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool f
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -407,7 +407,7 @@ BoundaryOpAttributes::GetSmoothingLevel() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -432,7 +432,7 @@ BoundaryOpAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -457,7 +457,7 @@ BoundaryOpAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......@@ -482,7 +482,7 @@ BoundaryOpAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......
......@@ -48,7 +48,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// Modifications:
//
......
// ***************************************************************************
//
// Copyright (c) 2000 - 2007, The Regents of the University of California
// Produced at the Lawrence Livermore National Laboratory
// All rights reserved.
//
// This file is part of VisIt. For details, see http://www.llnl.gov/visit/. 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 materials provided with the distribution.
// - Neither the name of the UC/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 THE REGENTS OF THE UNIVERSITY OF
// CALIFORNIA, 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.
//
// ***************************************************************************
package llnl.visit.operators;
import llnl.visit.AttributeSubject;
import llnl.visit.CommunicationBuffer;
import llnl.visit.Plugin;
// ****************************************************************************
// Class: BoundaryOpAttributes
//
// Purpose:
// Attributes for Boundary Operator
//
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Tue Aug 14 10:29:41 PDT 2007
//
// Modifications:
//
// ****************************************************************************
public class BoundaryOpAttributes extends AttributeSubject implements Plugin
{
public BoundaryOpAttributes()
{
super(1);
smoothingLevel = 0;
}
public BoundaryOpAttributes(BoundaryOpAttributes obj)
{
super(1);
smoothingLevel = obj.smoothingLevel;
SelectAll();
}
public boolean equals(BoundaryOpAttributes obj)
{
// Create the return value
return ((smoothingLevel == obj.smoothingLevel));
}
public String GetName() { return "Boundary"; }
public String GetVersion() { return "1.0"; }
// Property setting methods
public void SetSmoothingLevel(int smoothingLevel_)
{
smoothingLevel = smoothingLevel_;
Select(0);
}
// Property getting methods
public int GetSmoothingLevel() { return smoothingLevel; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
{
if(WriteSelect(0, buf))
buf.WriteInt(smoothingLevel);
}
public void ReadAtts(int n, CommunicationBuffer buf)
{
buf.ReadByte();
SetSmoothingLevel(buf.ReadInt());
}
// Attributes
private int smoothingLevel;
}
......@@ -36,14 +36,14 @@
*****************************************************************************/
// ************************************************************************* //
// File: BoundaryCommonPluginInfo.C
// File: BoundaryOpCommonPluginInfo.C
// ************************************************************************* //
#include <BoundaryPluginInfo.h>
#include <BoundaryOpPluginInfo.h>
#include <BoundaryOpAttributes.h>
// ****************************************************************************
// Method: BoundaryCommonPluginInfo::AllocAttributes
// Method: BoundaryOpCommonPluginInfo::AllocAttributes
//
// Purpose:
// Return a pointer to a newly allocated attribute subject.
......@@ -51,33 +51,33 @@
// Returns: A pointer to the newly allocated attribute subject.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
AttributeSubject *
BoundaryCommonPluginInfo::AllocAttributes()
BoundaryOpCommonPluginInfo::AllocAttributes()
{
return new BoundaryOpAttributes;
}
// ****************************************************************************
// Method: BoundaryCommonPluginInfo::CopyAttributes
// Method: BoundaryOpCommonPluginInfo::CopyAttributes
//
// Purpose:
// Copy a Boundary attribute subject.
// Copy a BoundaryOp attribute subject.
//
// Arguments:
// to The destination attribute subject.
// from The source attribute subject.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
void
BoundaryCommonPluginInfo::CopyAttributes(AttributeSubject *to,
BoundaryOpCommonPluginInfo::CopyAttributes(AttributeSubject *to,
AttributeSubject *from)
{
*((BoundaryOpAttributes *) to) = *((BoundaryOpAttributes *) from);
......
......@@ -36,33 +36,33 @@
*****************************************************************************/
// ************************************************************************* //
// File: BoundaryEnginePluginInfo.C
// File: BoundaryOpEnginePluginInfo.C
// ************************************************************************* //
#include <BoundaryPluginInfo.h>
#include <avtBoundaryFilter.h>
#include <BoundaryOpPluginInfo.h>
#include <avtBoundaryOpFilter.h>
#if defined(__APPLE__)
#define GetEngineInfo Boundary_GetEngineInfo
#define GetEngineInfo BoundaryOp_GetEngineInfo
#endif
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the Boundary operator.
// Return a new EnginePluginInfo for the BoundaryOp operator.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
extern "C" EngineOperatorPluginInfo* GetEngineInfo()
{
return new BoundaryEnginePluginInfo;
return new BoundaryOpEnginePluginInfo;
}
// ****************************************************************************
// Method: BoundaryEnginePluginInfo::AllocAvtPluginFilter
// Method: BoundaryOpEnginePluginInfo::AllocAvtPluginFilter
//
// Purpose:
// Return a pointer to a newly allocated avtPluginFilter.
......@@ -70,12 +70,12 @@ extern "C" EngineOperatorPluginInfo* GetEngineInfo()
// Returns: A pointer to the newly allocated avtPluginFilter.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
avtPluginFilter *
BoundaryEnginePluginInfo::AllocAvtPluginFilter()
BoundaryOpEnginePluginInfo::AllocAvtPluginFilter()
{
return new avtBoundaryFilter;
return new avtBoundaryOpFilter;
}
......@@ -36,34 +36,34 @@
*****************************************************************************/
// ************************************************************************* //
// File: BoundaryGUIPluginInfo.C
// File: BoundaryOpGUIPluginInfo.C
// ************************************************************************* //
#include <BoundaryPluginInfo.h>
#include <BoundaryOpPluginInfo.h>
#include <BoundaryOpAttributes.h>
#include <QvisBoundaryWindow.h>
#include <QvisBoundaryOpWindow.h>
#if defined(__APPLE__)
#define GetGUIInfo Boundary_GetGUIInfo
#define GetGUIInfo BoundaryOp_GetGUIInfo
#endif
// ****************************************************************************
// Function: GetGUIInfo
//
// Purpose:
// Return a new GUIPluginInfo for the Boundary operator.
// Return a new GUIPluginInfo for the BoundaryOp operator.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 23:00:22 PST 2007
//
// ****************************************************************************
extern "C" GUIOperatorPluginInfo* GetGUIInfo()
{
return new BoundaryGUIPluginInfo;
return new BoundaryOpGUIPluginInfo;
}
// ****************************************************************************
// Method: BoundaryGUIPluginInfo::GetMenuName
// Method: BoundaryOpGUIPluginInfo::GetMenuName
//
// Purpose:
// Return a pointer to the name to use in the GUI menu.
......@@ -71,19 +71,19 @@ extern "C" GUIOperatorPluginInfo* GetGUIInfo()
// Returns: A pointer to the name to use in the GUI menu.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 23:00:22 PST 2007
//
// ****************************************************************************
const char *
BoundaryGUIPluginInfo::GetMenuName() const
BoundaryOpGUIPluginInfo::GetMenuName() const
{
return "Boundary";
}
// ****************************************************************************
// Method: BoundaryGUIPluginInfo::CreatePluginWindow
// Method: BoundaryOpGUIPluginInfo::CreatePluginWindow
//
// Purpose:
// Return a pointer to an operator's attribute window.
......@@ -96,20 +96,20 @@ BoundaryGUIPluginInfo::GetMenuName() const
// Returns: A pointer to the operator's attribute window.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 23:00:22 PST 2007
//
// ****************************************************************************
QvisPostableWindowObserver *
BoundaryGUIPluginInfo::CreatePluginWindow(int type, AttributeSubject *attr,
BoundaryOpGUIPluginInfo::CreatePluginWindow(int type, AttributeSubject *attr,
QvisNotepadArea *notepad)
{
return new QvisBoundaryWindow(type, (BoundaryOpAttributes *)attr,
"Boundary operator attributes", "Boundary operator", notepad);
return new QvisBoundaryOpWindow(type, (BoundaryOpAttributes *)attr,
"Boundary operator attributes", "BoundaryOp operator", notepad);
}
// ****************************************************************************
// Method: BoundaryGUIPluginInfo::XPMIconData
// Method: BoundaryOpGUIPluginInfo::XPMIconData
//
// Purpose:
// Return a pointer to the icon data.
......@@ -117,13 +117,13 @@ BoundaryGUIPluginInfo::CreatePluginWindow(int type, AttributeSubject *attr,
// Returns: A pointer to the icon data.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 23:00:22 PST 2007
//
// ****************************************************************************
#include <Boundary.xpm>
#include <BoundaryOp.xpm>
const char **
BoundaryGUIPluginInfo::XPMIconData() const
BoundaryOpGUIPluginInfo::XPMIconData() const
{
return Boundary_xpm;
return BoundaryOp_xpm;
}
......@@ -36,40 +36,40 @@
*****************************************************************************/
// ************************************************************************* //
// File: BoundaryPluginInfo.C
// File: BoundaryOpPluginInfo.C
// ************************************************************************* //
#include <BoundaryPluginInfo.h>
#include <BoundaryOpPluginInfo.h>
#include <BoundaryOpAttributes.h>
#include <visit-config.h>
#if defined(__APPLE__)
extern "C" const char *BoundaryVisItPluginVersion = VERSION;
extern "C" const char *BoundaryOpVisItPluginVersion = VERSION;
#else
extern "C" const char *VisItPluginVersion = VERSION;
#endif
#if defined(__APPLE__)
#define GetGeneralInfo Boundary_GetGeneralInfo
#define GetGeneralInfo BoundaryOp_GetGeneralInfo
#endif
// ****************************************************************************
// Function: GetGeneralInfo
//
// Purpose:
// Return a new GeneralPluginInfo for the Boundary operator.
// Return a new GeneralPluginInfo for the BoundaryOp operator.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
extern "C" GeneralOperatorPluginInfo* GetGeneralInfo()
{
return new BoundaryGeneralPluginInfo;
return new BoundaryOpGeneralPluginInfo;
}
// ****************************************************************************
// Method: BoundaryGeneralPluginInfo::GetName
// Method: BoundaryOpGeneralPluginInfo::GetName
//
// Purpose:
// Return the name of the operator plugin.
......@@ -77,18 +77,18 @@ extern "C" GeneralOperatorPluginInfo* GetGeneralInfo()
// Returns: A pointer to the name of the operator plugin.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
char *
BoundaryGeneralPluginInfo::GetName() const
BoundaryOpGeneralPluginInfo::GetName() const
{
return "Boundary";
return "BoundaryOp";
}
// ****************************************************************************
// Method: BoundaryGeneralPluginInfo::GetVersion
// Method: BoundaryOpGeneralPluginInfo::GetVersion
//
// Purpose:
// Return the version of the operator plugin.
......@@ -96,18 +96,18 @@ BoundaryGeneralPluginInfo::GetName() const
// Returns: A pointer to the version of the operator plugin.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
char *
BoundaryGeneralPluginInfo::GetVersion() const
BoundaryOpGeneralPluginInfo::GetVersion() const
{
return "1.0";
}
// ****************************************************************************
// Method: BoundaryGeneralPluginInfo::GetID
// Method: BoundaryOpGeneralPluginInfo::GetID
//
// Purpose:
// Return the id of the operator plugin.
......@@ -115,17 +115,17 @@ BoundaryGeneralPluginInfo::GetVersion() const
// Returns: A pointer to the id of the operator plugin.
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
char *
BoundaryGeneralPluginInfo::GetID() const
BoundaryOpGeneralPluginInfo::GetID() const
{
return "Boundary_1.0";
return "BoundaryOp_1.0";
}
// ****************************************************************************
// Method: BoundaryGeneralPluginInfo::EnabledByDefault
// Method: BoundaryOpGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
......@@ -133,12 +133,12 @@ BoundaryGeneralPluginInfo::GetID() const
// Returns: true/false
//
// Programmer: ghweber -- generated by xml2info
// Creation: Tue Aug 14 10:29:40 PDT 2007
// Creation: Fri Aug 24 22:44:43 PST 2007
//
// ****************************************************************************
bool
BoundaryGeneralPluginInfo::EnabledByDefault() const
BoundaryOpGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
......@@ -36,30 +36,30 @@
*****************************************************************************/
// ************************************************************************* //
// File: BoundaryPluginInfo.h
// File: BoundaryOpPluginInfo.h
// ************************************************************************* //
#ifndef BOUNDARY_PLUGIN_INFO_H
#define BOUNDARY_PLUGIN_INFO_H
#ifndef BOUNDARYOP_PLUGIN_INFO_H
#define BOUNDARYOP_PLUGIN_INFO_H
#include <OperatorPluginInfo.h>
#include <operator_plugin_exports.h>
class BoundaryOpAttributes;
// ****************************************************************************