Commit 0f248594 authored by bonnell's avatar bonnell

Fix compilation errors

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@6381 18c085ea-50e0-402c-830e-de6fd14e8384
parent 72126007
......@@ -222,8 +222,8 @@ avtCurveCMFEExpression::RemoveDuplicateX(vtkRectilinearGrid *rgrid)
size_t i, j, k, nDups = 1;
size_t ny = rgrid->GetPointData()->GetNumberOfArrays();
double *sum = new double[ny];
vtkDataArray **y = new (vtkDataArray*)[ny];
vtkDataArray **Y = new (vtkDataArray*)[ny];
vtkDataArray **y = new vtkDataArray*[ny];
vtkDataArray **Y = new vtkDataArray*[ny];
vtkDataArray *x = rgrid->GetXCoordinates();
for (i = 0; i < ny; i++)
......
......@@ -4871,7 +4871,7 @@ QvisGUIApplication::ReadPluginWindowConfigs(DataNode *parentNode,
GUIPlotPluginInfo *GUIInfo = plotPluginManager->GetGUIPluginInfo(
plotPluginManager->GetEnabledID(i));
std::string key(GUIInfo->GetMenuName()->latin1());
std::string key(GUIInfo->GetMenuName()->toStdString());
key += " plot attributes";
if(plotWindows[i] != 0 &&
......@@ -4902,7 +4902,7 @@ QvisGUIApplication::ReadPluginWindowConfigs(DataNode *parentNode,
GUIOperatorPluginInfo *GUIInfo = operatorPluginManager->GetGUIPluginInfo(
operatorPluginManager->GetEnabledID(i));
std::string key(GUIInfo->GetMenuName()->latin1());
std::string key(GUIInfo->GetMenuName()->toStdString());
key += " operator attributes";
if(operatorWindows[i] != 0 &&
......
......@@ -42,6 +42,7 @@
#include <PersistentParticlesPluginInfo.h>
#include <PersistentParticlesAttributes.h>
#include <qapplication.h>
#include <QvisPersistentParticlesWindow.h>
#if defined(__APPLE__)
......@@ -76,10 +77,10 @@ extern "C" GUIOperatorPluginInfo* GetGUIInfo()
//
// ****************************************************************************
const char *
QString *
PersistentParticlesGUIPluginInfo::GetMenuName() const
{
return "PersistentParticles";
return new QString(qApp->translate("OperatorNames", "PersistentParticles"));
}
......@@ -102,9 +103,11 @@ PersistentParticlesGUIPluginInfo::GetMenuName() const
// ****************************************************************************
QvisPostableWindowObserver *
PersistentParticlesGUIPluginInfo::CreatePluginWindow(int type, AttributeSubject *attr,
QvisNotepadArea *notepad)
PersistentParticlesGUIPluginInfo::CreatePluginWindow(int type,
AttributeSubject *attr, const QString &caption,
const QString &shortName, QvisNotepadArea *notepad)
{
return new QvisPersistentParticlesWindow(type, (PersistentParticlesAttributes *)attr,
"PersistentParticles operator attributes", "PersistentParticles operator", notepad);
return new QvisPersistentParticlesWindow(type,
(PersistentParticlesAttributes *)attr,
caption, shortName, notepad);
}
......@@ -79,9 +79,10 @@ class PersistentParticlesCommonPluginInfo : public virtual CommonOperatorPluginI
class PersistentParticlesGUIPluginInfo : public virtual GUIOperatorPluginInfo, public virtual PersistentParticlesCommonPluginInfo
{
public:
virtual const char *GetMenuName() const;
virtual QString *GetMenuName() const;
virtual QvisPostableWindowObserver *CreatePluginWindow(int type,
AttributeSubject *attr, QvisNotepadArea *notepad);
AttributeSubject *attr, const QString &caption,
const QString &shortName, QvisNotepadArea *notepad);
};
class PersistentParticlesViewerPluginInfo : public virtual ViewerOperatorPluginInfo, public virtual PersistentParticlesCommonPluginInfo
......@@ -95,6 +96,7 @@ class PersistentParticlesViewerPluginInfo : public virtual ViewerOperatorPluginI
virtual void InitializeOperatorAtts(AttributeSubject *atts,
const ViewerPlot *plot,
const bool fromDefault);
virtual QString *GetMenuName() const;
static void InitializeGlobalObjects();
private:
......
......@@ -42,6 +42,7 @@
#include <PersistentParticlesPluginInfo.h>
#include <PersistentParticlesAttributes.h>
#include <qapplication.h>
#if defined(__APPLE__)
#define GetViewerInfo PersistentParticles_GetViewerInfo
......@@ -69,6 +70,26 @@ extern "C" ViewerOperatorPluginInfo* GetViewerInfo()
PersistentParticlesAttributes *PersistentParticlesViewerPluginInfo::clientAtts = NULL;
PersistentParticlesAttributes *PersistentParticlesViewerPluginInfo::defaultAtts = NULL;
// ****************************************************************************
// Method: PersistentParticlesViewerPluginInfo::GetMenuName
//
// Purpose:
// Return a pointer to the name to use in the viewer menus.
//
// Returns: A pointer to the name to use in the viewer menus.
//
// Programmer: childs -- generated by xml2info
// Creation: Fri Jan 25 11:27:40 PDT 2008
//
// ****************************************************************************
QString *
PersistentParticlesViewerPluginInfo::GetMenuName() const
{
return new QString(qApp->translate("OperatorNames", "PersistentParticles"));
}
// ****************************************************************************
// Method: PersistentParticlesViewerPluginInfo::InitializeGlobalObjects
//
......
......@@ -41,20 +41,9 @@
#include <PersistentParticlesAttributes.h>
#include <ViewerProxy.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qspinbox.h>
#include <qvbox.h>
#include <qbuttongroup.h>
#include <qradiobutton.h>
#include <QvisColorTableButton.h>
#include <QvisOpacitySlider.h>
#include <QvisColorButton.h>
#include <QvisLineStyleWidget.h>
#include <QvisLineWidthWidget.h>
#include <QvisVariableButton.h>
#include <QLabel>
#include <QGridLayout>
#include <QLineEdit>
#include <stdio.h>
#include <string>
......@@ -76,8 +65,8 @@ using std::string;
QvisPersistentParticlesWindow::QvisPersistentParticlesWindow(const int type,
PersistentParticlesAttributes *subj,
const char *caption,
const char *shortName,
const QString &caption,
const QString &shortName,
QvisNotepadArea *notepad)
: QvisOperatorWindow(type,subj, caption, shortName, notepad)
{
......@@ -119,26 +108,28 @@ QvisPersistentParticlesWindow::~QvisPersistentParticlesWindow()
void
QvisPersistentParticlesWindow::CreateWindowContents()
{
QGridLayout *mainLayout = new QGridLayout(topLayout, 3,2, 10, "mainLayout");
QGridLayout *mainLayout = new QGridLayout(0);
mainLayout->setMargin(10);
mainLayout->setSpacing(5);
startIndexLabel = new QLabel("Index of first time slice", central, "startIndexLabel");
startIndexLabel = new QLabel(tr("Index of first time slice"), central);
mainLayout->addWidget(startIndexLabel,0,0);
startIndex = new QLineEdit(central, "startIndex");
startIndex = new QLineEdit(tr("startIndex"), central);
connect(startIndex, SIGNAL(returnPressed()),
this, SLOT(startIndexProcessText()));
mainLayout->addWidget(startIndex, 0,1);
stopIndexLabel = new QLabel("Index of last time slice", central, "stopIndexLabel");
stopIndexLabel = new QLabel(tr("Index of last time slice"), central);
mainLayout->addWidget(stopIndexLabel,1,0);
stopIndex = new QLineEdit(central, "stopIndex");
stopIndex = new QLineEdit(tr("stopIndex"),central);
connect(stopIndex, SIGNAL(returnPressed()),
this, SLOT(stopIndexProcessText()));
mainLayout->addWidget(stopIndex, 1,1);
strideLabel = new QLabel("Skip rate between time slices", central, "strideLabel");
strideLabel = new QLabel(tr("Skip rate between time slices"), central);
mainLayout->addWidget(strideLabel,2,0);
stride = new QLineEdit(central, "stride");
stride = new QLineEdit(tr("stride"), central);
connect(stride, SIGNAL(returnPressed()),
this, SLOT(strideProcessText()));
mainLayout->addWidget(stride, 2,1);
......@@ -229,7 +220,7 @@ QvisPersistentParticlesWindow::GetCurrentValues(int which_widget)
// Do startIndex
if(which_widget == PersistentParticlesAttributes::ID_startIndex || doAll)
{
temp = startIndex->displayText().simplifyWhiteSpace();
temp = startIndex->displayText().simplified();
okay = !temp.isEmpty();
if(okay)
{
......@@ -250,7 +241,7 @@ QvisPersistentParticlesWindow::GetCurrentValues(int which_widget)
// Do stopIndex
if(which_widget == PersistentParticlesAttributes::ID_stopIndex || doAll)
{
temp = stopIndex->displayText().simplifyWhiteSpace();
temp = stopIndex->displayText().simplified();
okay = !temp.isEmpty();
if(okay)
{
......@@ -271,7 +262,7 @@ QvisPersistentParticlesWindow::GetCurrentValues(int which_widget)
// Do stride
if(which_widget == PersistentParticlesAttributes::ID_stride || doAll)
{
temp = stride->displayText().simplifyWhiteSpace();
temp = stride->displayText().simplified();
okay = !temp.isEmpty();
if(okay)
{
......
......@@ -44,17 +44,7 @@
class PersistentParticlesAttributes;
class QLabel;
class QCheckBox;
class QLineEdit;
class QSpinBox;
class QVBox;
class QButtonGroup;
class QvisColorTableButton;
class QvisOpacitySlider;
class QvisColorButton;
class QvisLineStyleWidget;
class QvisLineWidthWidget;
class QvisVariableButton;
// ****************************************************************************
// Class: QvisPersistentParticlesWindow
......@@ -77,8 +67,8 @@ class QvisPersistentParticlesWindow : public QvisOperatorWindow
public:
QvisPersistentParticlesWindow(const int type,
PersistentParticlesAttributes *subj,
const char *caption = 0,
const char *shortName = 0,
const QString &caption = QString::null,
const QString &shortName = QString::null,
QvisNotepadArea *notepad = 0);
virtual ~QvisPersistentParticlesWindow();
virtual void CreateWindowContents();
......
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