Commit 3e4a7917 authored by hrchilds's avatar hrchilds

Update from June 20, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@17 18c085ea-50e0-402c-830e-de6fd14e8384
parent dc940b8c
......@@ -431,20 +431,12 @@ DebugStream::~DebugStream()
// Jeremy Meredith, Fri Jun 1 17:25:01 PDT 2001
// Added setting of 'enabled' to true.
//
// Brad Whitlock, Fri Apr 18 15:42:07 PST 2003
// I made the debug logs get the process id..
//
// ****************************************************************************
void
DebugStream::open(const char *progname)
{
char filename[256];
#if defined(_WIN32)
DWORD id = GetCurrentProcessId();
sprintf(filename, "%s.%d.%d.log", progname, (unsigned int)id, level);
#else
sprintf(filename, "%s.%d.%d.log", progname, (unsigned int)getpid(), level);
#endif
sprintf(filename, "%s.%d.log", progname, level);
buf.open(filename);
enabled = true;
}
......
......@@ -112,14 +112,21 @@ NewHandler(void)
// Jeremy Meredith, Wed Aug 7 13:17:01 PDT 2002
// Made it clamp the debug level to 0 through 5.
//
// Brad Whitlock, Wed Jun 18 13:35:02 PST 2003
// I made the debug logs have pids by default on Windows.
//
// ****************************************************************************
void
Init::Initialize(int &argc, char *argv[], int r, int n, bool strip)
{
int debuglevel = 0;
#if defined(_WIN32)
bool usePid = true;
#else
bool usePid = false;
#endif
for (int i=1; i<argc; i++)
{
if (strcmp("-debug",argv[i]) == 0)
......
#include <AppearanceAttributes.h>
#include <DataNode.h>
#if defined(_WIN32)
#include <windows.h>
#endif
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
......@@ -16,13 +20,27 @@
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes() : AttributeSubject("ssssi")
AppearanceAttributes::AppearanceAttributes() : AttributeSubject("ssssi"),
background("#c0c0c0"), foreground("#000000"),
fontDescription("-adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1"),
style("motif")
{
background = "#c0c0c0";
foreground = "#000000";
fontDescription = "-adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1";
style = "motif";
orientation = 0;
#if defined(_WIN32)
char tmp[20];
DWORD c;
unsigned char *cptr = (unsigned char *)&c;
c = GetSysColor(COLOR_BTNFACE);
sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2]));
background = tmp;
c = GetSysColor(COLOR_WINDOWTEXT);
sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2]));
foreground = tmp;
style = "windows";
#endif
}
// ****************************************************************************
......
......@@ -533,8 +533,9 @@ SILAttributes::SetFromNode(DataNode *parentNode)
// Go through all of the children and construct a new
// NamespaceAttributes for each one of them.
int i;
children = searchNode->GetChildren();
for(int i = 0; i < searchNode->GetNumChildren(); ++i)
for(i = 0; i < searchNode->GetNumChildren(); ++i)
{
if(children[i]->GetKey() == std::string("NamespaceAttributes"))
{
......@@ -550,7 +551,7 @@ SILAttributes::SetFromNode(DataNode *parentNode)
// Go through all of the children and construct a new
// SILMatrixAttributes for each one of them.
children = searchNode->GetChildren();
for(int i = 0; i < searchNode->GetNumChildren(); ++i)
for(i = 0; i < searchNode->GetNumChildren(); ++i)
{
if(children[i]->GetKey() == std::string("SILMatrixAttributes"))
{
......
......@@ -120,6 +120,9 @@ avtViewInfo::operator==(const avtViewInfo &vi)
if (imagePan[0] != vi.imagePan[0] || imagePan[1] != vi.imagePan[1] ||
imageZoom != vi.imageZoom)
{
return false;
}
return true;
}
......
......@@ -318,6 +318,10 @@ QvisFilePanel::Update(Subject *TheChangedSubject)
// Brad Whitlock, Mon Mar 31 15:09:51 PST 2003
// I added database pixmaps for virtual files.
//
// Brad Whitlock, Fri Jun 20 14:08:30 PST 2003
// I fixed a bug that caused the GUI to hang when there were files from
// more than one host.
//
// ****************************************************************************
void
......@@ -353,17 +357,13 @@ QvisFilePanel::UpdateFileList(bool doAll)
// host map. If it isn't, make sure that files from that host are
// not expanded by default.
FileDisplayInformationMap::iterator exfile;
for(exfile = displayInfo.begin(); exfile != displayInfo.end(); )
for(exfile = displayInfo.begin(); exfile != displayInfo.end(); ++exfile)
{
if(exfile->first.host.size() > 0 &&
hostMap.find(exfile->first.host) == hostMap.end())
{
RemoveExpandedFile(exfile->first);
}
else
{
++exfile;
}
}
// Clear out the fileListView widget.
......
......@@ -217,6 +217,11 @@ QvisPlotListBoxItem::width(const QListBox *lb) const
// Brad Whitlock, Wed May 7 19:09:34 PST 2003
// I fixed it so it looks okay on Windows.
//
// Brad Whitlock, Fri Jun 20 10:42:58 PDT 2003
// I made plots have "(hidden)" in their name when they are expanded and
// hidden. I forgot to add that case when I added the code to draw
// expanded plots.
//
// ****************************************************************************
void QvisPlotListBoxItem::paint(QPainter *painter)
......@@ -420,7 +425,10 @@ void QvisPlotListBoxItem::paint(QPainter *painter)
int textdY = (maxIconHeight - textHeight) / 2;
int thisTextY = iconY + textHeight + textdY;
setTextPen(painter, false);
painter->drawText(textX, thisTextY, plotName);
if(plot.GetHiddenFlag())
painter->drawText(textX, thisTextY, plotName + " (hidden)");
else
painter->drawText(textX, thisTextY, plotName);
// Make the text and icon clickable.
QRect textRect(iconX, iconY,
listBox()->width(), maxIconHeight);
......@@ -702,7 +710,9 @@ QvisPlotListBoxItem::drawDeleteButton(QPainter *painter, const QRect &r) const
// Creation: Tue Apr 8 16:32:59 PST 2003
//
// Modifications:
//
// Brad Whitlock, Wed Jun 18 13:00:04 PST 2003
// I made single clicking work for the Subset button.
//
// ****************************************************************************
int
......@@ -723,7 +733,7 @@ QvisPlotListBoxItem::clicked(const QPoint &pos, bool doubleClicked, int &id)
}
QRect subsetButton(bw + 4, 1, bw, bw);
if(subsetButton.contains(pos) && doubleClicked)
if(subsetButton.contains(pos))
{
return 1;
}
......
......@@ -376,6 +376,7 @@ QvisRenderingWindow::UpdateInformation(bool doAll)
{
QString tmp;
float fps;
int j;
// Loop through all the attributes and do something for
// each of them that changed. This function is only responsible
......@@ -431,7 +432,7 @@ QvisRenderingWindow::UpdateInformation(bool doAll)
approxNumTriangles->setText(tmp);
break;
case 11: //extents
for(int j = 0; j < 6; ++j)
for(j = 0; j < 6; ++j)
{
double d = windowInfo->GetExtents()[j];
if(d == DBL_MAX || d == -DBL_MAX)
......
......@@ -13,7 +13,7 @@ enhancements and bug-fixes that were added to this release.</p>
<p><b><font size="4">Features added in version 1.1.5</font></b></p>
<ul>
<li>Databases can be reopened at the current timestep so variables that appear later in time are supported.</li>
<li>VisIt has a new point tool that can be used to select a new origin for the new ThreeSlice operator, which performs three orthogonal slices on 3D databases and leaves the resulting slices in 3D.
<li>Panning and zooming is vastly improved so that it no longer moves the camera.</li>
<li>The Boundary plot now has a button for filled vs. unfilled.</li>
<li>Pipeline caching is now off by default.</li>
......@@ -27,6 +27,8 @@ enhancements and bug-fixes that were added to this release.</p>
</ul>
<p><b><font size="4">Bugs fixed in version 1.1.5</font></b></p>
<ul>
<li>VisIt sometimes crashes when plots and operators are disabled.</li>
<li>Pick returns bad values for databases that have ghost cells.</li>
<li>Multifile databases in which a file is missing can hang the parallel compute engine.</li>
<li>Host profiles for the ice machine have been added.</li>
<li>Silo paths are not handled well on Windows.</li>
......
......@@ -52,7 +52,7 @@ public class TryLighting extends RunViewer implements SimpleObserver
// Set the view
ViewAttributes v = viewer.GetView3D();
v.SetCamera(0.456808, 0.335583, 0.823839);
v.SetViewNormal(0.456808, 0.335583, 0.823839);
v.SetFocus(-0.927295, -1.22113, 1.01159);
v.SetViewUp(-0.184554, 0.941716, -0.281266);
v.SetParallelScale(15.7041);
......
......@@ -55,6 +55,10 @@ inline char toupper(char c)
// Brad Whitlock, Thu Dec 12 09:58:30 PDT 2002
// I added ucharVector support.
//
// Brad Whitlock, Fri Jun 20 10:55:22 PDT 2003
// I fixed a bug in the code generation for setattr that caused bad code
// to be generated when the first field it internal.
//
// ****************************************************************************
// ----------------------------------------------------------------------------
......@@ -184,7 +188,6 @@ class PythonGeneratorField : public virtual Field
virtual void WriteSetAttr(ostream &c, const QString &className, bool first)
{
// Do not add any methods if the field is internal.
if(internal)
return;
......@@ -1114,15 +1117,6 @@ class AttsGeneratorColor : public virtual Color , public virtual PythonGenerator
c << " const unsigned char *" << name << " = obj->data->" << MethodNameGet() << "().GetColor();" << endl;
c << " fprintf(fp, \"" << name << " = (%d, %d, %d, %d)\\n\", int("<<name<<"[0]), int("<<name<<"[1]), int("<<name<<"[2]), int("<<name<<"[3]));" << endl;
}
virtual void WriteSetAttr(ostream &c, const QString &className, bool first)
{
if(first)
c << " if(strcmp(name, \"" << name << "\") == 0)" << endl;
else
c << " else if(strcmp(name, \"" << name << "\") == 0)" << endl;
c << " retval = ("<<className<<"_"<<MethodNameSet()<<"(self, args) != NULL);" << endl;
}
};
......@@ -1612,14 +1606,14 @@ class PythonGeneratorAttribute
int i, index = 0;
for(i = 0; i < fields.size(); ++i)
{
if(fields[i]->HasSetAttr())
if(fields[i]->HasSetAttr() && !fields[i]->internal)
{
index = i;
break;
}
}
for(i = 0; i < fields.size(); ++i)
for(i = index; i < fields.size(); ++i)
fields[i]->WriteSetAttr(c, name, i == index);
c << endl;
......
......@@ -30,6 +30,7 @@
#define __vtkCamera_h
#include "vtkObject.h"
#include <visit_vtk_exports.h>
class vtkMatrix4x4;
class vtkPerspectiveTransform;
......@@ -37,7 +38,7 @@ class vtkRenderer;
class vtkTransform;
class vtkLinearTransform;
class VTK_RENDERING_EXPORT vtkCamera : public vtkObject
class VISIT_VTK_API vtkCamera : public vtkObject
{
public:
void PrintSelf(ostream& os, vtkIndent indent);
......
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