Commit c5b5865d authored by hrchilds's avatar hrchilds

Update from March 9, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@428 18c085ea-50e0-402c-830e-de6fd14e8384
parent 572f083c
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -4344,6 +4344,9 @@ QvisGUIApplication::AboutVisIt()
// I added code to set the active window to the splashscreen so the focus
// stays on the splashscreen when we run on MacOS X.
//
// Brad Whitlock, Tue Mar 8 16:10:11 PST 2005
// I ifdef'd out the setActiveWindow code so it only happens on MacOS X.
//
// ****************************************************************************
void
......@@ -4351,7 +4354,9 @@ QvisGUIApplication::SplashScreenProgress(const char *msg, int prog)
{
if(splash)
{
#if defined(Q_WS_MACX)
splash->setActiveWindow();
#endif
splash->Progress(msg, prog);
}
}
......
#include <SplashScreen.h>
#include <qapplication.h>
#include <qfont.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qpushbutton.h>
......@@ -67,6 +68,9 @@
// Brad Whitlock, Tue Apr 27 14:21:15 PST 2004
// I made it modal on MacOS X to fix a menu bug that I ran into.
//
// Brad Whitlock, Tue Mar 8 16:07:36 PST 2005
// Added some code to draw the "Beta" marking back in.
//
// ****************************************************************************
SplashScreen::SplashScreen(bool cyclePictures, const char *name) :
......@@ -81,7 +85,8 @@ SplashScreen::SplashScreen(bool cyclePictures, const char *name) :
// If the window manager is dumb enough to put decorations on this
// window, at least put a reasonable title on it.
setCaption(QString("VisIt ") + VERSION);
QString ver(VERSION);
setCaption(QString("VisIt ") + ver);
// Set up a box to put the picture in
setFrameStyle(QFrame::Panel | QFrame::Raised);
......@@ -116,6 +121,27 @@ SplashScreen::SplashScreen(bool cyclePictures, const char *name) :
pictures.push_back(QPixmap(VisIt4_xpm));
#endif
// If we have a beta in the version number, draw "Beta" on the pictures.
if(ver.right(1) == "b")
{
for(int i = 0; i < pictures.size(); ++i)
{
QPainter painter(&pictures[i]);
double scale = 4.;
painter.scale(scale, scale);
QFont font("helvetica", 24, QFont::Bold, true);
font.setItalic(false);
int x = 10;
int y = pictures[i].height() - 10;
int offset = 4;
painter.setPen(black);
painter.drawText(int(x / scale), int(y / scale), "Beta");
painter.setPen(white);
painter.drawText(int((x - offset) / scale),
int((y - offset) / scale), "Beta");
}
}
// Set the picture on the window
pictureLabel = new QLabel(this);
pictureLabel->setPixmap(pictures[curPicture]);
......
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -16,6 +16,9 @@
# Eric Brugger, Fri Aug 29 16:29:36 PDT 2003
# I modified the script to use the new interface for setting views.
#
# Brad Whitlock, Wed Mar 9 09:38:48 PDT 2005
# Removed deprecated functions.
#
# *****************************************************************************
import os
......@@ -158,7 +161,7 @@ for i in range(4):
for i in range(0, nframes-1):
# Only advance in time one in every "frames_per_timestep"
if ((i % frames_per_timestep) == 0):
AnimationSetFrame(i/frames_per_timestep)
SetTimeSliderState(i/frames_per_timestep)
t = float(i) / float(nframes - 1)
v = EvalCubicSpline(t, x, vpts)
......
......@@ -12,6 +12,9 @@
# Eric Brugger, Fri Aug 29 16:32:36 PDT 2003
# I modified the script to use the new interface for setting views.
#
# Brad Whitlock, Wed Mar 9 09:38:48 PDT 2005
# Removed deprecated functions.
#
# ----------------------------------------------------------------------------
import os
......@@ -57,7 +60,7 @@ def wave():
t = float(i) / float(GetDatabaseNStates() - 1)
newview = (t * v2) + ((1. - t) * v)
DisableRedraw()
AnimationSetFrame(i)
SetTimeSliderState(i)
SetView3D(newview)
RedrawWindow()
......
This diff is collapsed.
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