Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit d00ff678 authored by hrchilds's avatar hrchilds

Update from March 4, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@190 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1f51a326
......@@ -68,6 +68,9 @@
# Hank Childs, Thu Jan 22 13:42:41 PST 2004
# Added Filters, FileWriter, and View libraries.
#
# Hank Childs, Thu Mar 4 08:18:50 PST 2004
# Add QtVisWindow directory.
#
##############################################################################
@SET_MAKE@
......@@ -76,7 +79,7 @@
SUBDIRS=Exceptions DBAtts Math Pipeline MIR \
Expressions Queries Database Plotter Filters FileWriter View \
@VISWINDOW@
@VISWINDOW@ QtVisWindow
message:
@echo
......
# Copyright 1991 - 2001
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#
# DISCLAIMER
#
# This software was prepared as an account of work sponsored by an agency of
# the United States Government. Neither the United States Government nor the
# University of California nor any of their employees, makes any warranty,
# express or implied, or assumes any liability or responsiblity for the
# accuracy, completeness, or usefullness of any information, apparatus,
# product, or process disclosed, or represents that its use would not infringe
# privately owned rights. Reference herein to any specific commercial
# products, process, or service by trade name, trademark, manufacturer, or
# otherwise, does not necessarily constitute or imply its endorsement,
# recommendation, or favoring by the United States Government or the
# University of California. The views and opinions of authors expressed herein
# do not necessarily state or reflect those of the United States Government or
# the University of California, and shall not be used for advertising or
# product endorsement purposes.
#
# Modifications:
#
# Hank Childs, Wed Feb 25 07:59:58 PST 2004
# Created.
#
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
##
## Files...
##
SRC=VisWinRenderingWithWindow.C QtVisWindow.C
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@ @VTKQT_CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libqtviswindow
LIBS=-lviswindow -lavtexceptions -lvisit_vtk -lmisc -lstate -lutility @VTK_LIBS@ $(X_LIBS)
##
## Standard targets...
##
all: $(LIBSHARED)
clean:
$(RM) $(OBJ) $(LIBSHARED)
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
// ************************************************************************* //
// QtVisWindow.C //
// ************************************************************************* //
#include <QtVisWindow.h>
#include <VisWinRenderingWithWindow.h>
// ****************************************************************************
// Method: QtVisWindow constructor
//
// Programmer: Hank Childs
// Creation: March 4, 2004
//
// ****************************************************************************
QtVisWindow::QtVisWindow() : VisWindow(false)
{
Initialize(new VisWinRenderingWithWindow(colleagueProxy));
}
// ************************************************************************* //
// QtVisWindow.h //
// ************************************************************************* //
#ifndef QT_VIS_WINDOW_H
#define QT_VIS_WINDOW_H
#include <VisWindow.h>
// ****************************************************************************
// Class: QtVisWindow
//
// Purpose:
// A vis window that uses Qt to do its windowing.
//
// Programmer: Hank Childs
// Creation: March 4, 2004
//
// ****************************************************************************
class QtVisWindow : public VisWindow
{
public:
QtVisWindow();
};
#endif
......@@ -9,6 +9,9 @@
#include <WindowMetrics.h>
#if QT_VERSION >= 300
#include <qcursor.h>
#endif
// ****************************************************************************
// Method: VisWinRenderingWithWindow constructor
......@@ -466,7 +469,9 @@ VisWinRenderingWithWindow::CreateToolbar(const char *name)
// Creation: Wed Jan 7 14:49:10 PST 2004
//
// Modifications:
//
// Brad Whitlock, Thu Mar 4 13:40:12 PST 2004
// I fixed the code so it works with Qt 3.x as well as the 2.3.x series.
//
// ****************************************************************************
void
......@@ -490,6 +495,18 @@ VisWinRenderingWithWindow::SetCursorForMode(INTERACTION_MODE m)
{
cursorIndex = newCursorIndex;
#if QT_VERSION >= 300
switch(cursorIndex)
{
default:
case 0:
renWin->setCursor(QCursor::ArrowCursor);
break;
case 1:
renWin->setCursor(QCursor::CrossCursor);
break;
}
#else
switch(cursorIndex)
{
default:
......@@ -500,6 +517,7 @@ VisWinRenderingWithWindow::SetCursorForMode(INTERACTION_MODE m)
renWin->setCursor(CrossCursor);
break;
}
#endif
}
}
......
......@@ -10,9 +10,8 @@
#include <vtkPolyData.h>
#include <vtkRenderer.h>
#include <vtkRenderWindow.h>
#include <vtkQtRenderWindow.h>
#include <vtkQtRenderWindowInteractor.h>
#include <vtkRenderWindowInteractor.h>
#include <vtkInteractorStyle.h>
#include <RenderingAttributes.h>
......
......@@ -95,6 +95,9 @@
# Brad Whitlock, Wed Nov 5 14:06:07 PST 2003
# Added several annotation colleagues.
#
# Hank Childs, Thu Mar 4 09:04:45 PST 2004
# Removed Qt references.
#
##############################################################################
@SET_MAKE@
......@@ -116,7 +119,6 @@ Colleagues_src= \
Colleagues/VisWinPlots.C \
Colleagues/VisWinQuery.C \
Colleagues/VisWinRendering.C \
Colleagues/VisWinRenderingWithWindow.C \
Colleagues/VisWinRenderingWithoutWindow.C \
Colleagues/VisWinTools.C \
Colleagues/VisWinTriad.C \
......@@ -158,12 +160,11 @@ VisWindow_src= \
VisWindow/VisWindow.C \
VisWindow/VisWindowTypes.C
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@COMPONENT_CPPFLAGS@ @VTKQT_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@
CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@
OBJ=$(SRC:.C=.o)
LIB=libviswindow
LIBS=-lavtmath_ser -lpipeline_ser -lplotter -lavtexceptions -lmisc -lstate -lvisit_vtk -lvtkqt @VTK_LIBS@ @QT_LDFLAGS@ @QT_LIBS@ $(X_LIBS)
LIBS=-lavtmath_ser -lpipeline_ser -lplotter -lavtexceptions -lmisc -lstate -lvisit_vtk -lvtkqt @VTK_LIBS@ $(X_LIBS)
##
## Standard targets...
......
......@@ -29,7 +29,6 @@
#include <VisWinLighting.h>
#include <VisWinPlots.h>
#include <VisWinQuery.h>
#include <VisWinRenderingWithWindow.h>
#include <VisWinRenderingWithoutWindow.h>
#include <VisWinTools.h>
#include <VisWinTriad.h>
......@@ -55,15 +54,56 @@ static void start_render(void *);
// ****************************************************************************
// Method: VisWindow constructor
//
// Programmer: Hank Childs
// Creation: May 4, 2000
//
// Modifications:
//
// Hank Childs, Thu Mar 4 08:43:15 PST 2004
// Made the constructor just call an initialize routine.
//
// ****************************************************************************
VisWindow::VisWindow()
: colleagueProxy(this), interactorProxy(this), renderProxy(this),
lightList()
{
Initialize(new VisWinRenderingWithoutWindow(colleagueProxy));
}
// ****************************************************************************
// Method: VisWindow protected constructor
//
// Programmer: Hank Childs
// Creation: March 4, 2004
//
// ****************************************************************************
VisWindow::VisWindow(bool callInit)
: colleagueProxy(this), interactorProxy(this), renderProxy(this),
lightList()
{
if (callInit)
{
Initialize(new VisWinRenderingWithoutWindow(colleagueProxy));
}
}
// ****************************************************************************
// Method: VisWindow::Initialize
//
// Purpose:
// Initializes the VisWindow. Does this by setting up many colleagues.
// Does the work of the constructor. Separated into its own routine so
// there will be a "single point of source".
//
// Arguments:
// doNoWinMode true if we should instantiate this VisWindow in a
// windowless mode.
// Notes: This routine was formerly the VisWindow constructor until that
// constructor got split on March 4, 2004. For this reason, some
// modification comments will come before the creation date.
//
// Programmer: Hank Childs
// Creation: May 4, 2000
// Creation: March 4, 2004
//
// Modifications:
//
......@@ -129,9 +169,8 @@ static void start_render(void *);
//
// ****************************************************************************
VisWindow::VisWindow(bool doNoWinMode)
: colleagueProxy(this), interactorProxy(this), renderProxy(this),
lightList()
void
VisWindow::Initialize(VisWinRendering *ren)
{
//
// Set up all of the non-colleague fields.
......@@ -162,14 +201,7 @@ VisWindow::VisWindow(bool doNoWinMode)
// rendering must be the first colleague added since it must change window
// modes before the rest.
//
if (doNoWinMode)
{
rendering = new VisWinRenderingWithoutWindow(colleagueProxy);
}
else
{
rendering = new VisWinRenderingWithWindow(colleagueProxy);
}
rendering = ren;
rendering->SetResizeEvent(ProcessResizeEvent, this);
AddColleague(rendering);
......
......@@ -242,13 +242,16 @@ class VisitInteractor;
// Brad Whitlock, Tue Jan 6 10:34:23 PDT 2004
// I added a new Pick method that uses viewport coordinates.
//
// Hank Childs, Thu Mar 4 08:41:07 PST 2004
// Made it easier to inherit from this class with your own renderer.
//
// ****************************************************************************
class VISWINDOW_API VisWindow
{
friend class VisWindowProtectionProxy;
public:
VisWindow(bool = false);
VisWindow();
virtual ~VisWindow();
void AddPlot(avtActor_p &);
......@@ -468,6 +471,8 @@ protected:
VisCallback *performLineoutCallback;
LINE_OUT_INFO *loInfo;
VisWindow(bool);
void Initialize(VisWinRendering *);
void ChangeMode(WINDOW_MODE);
void Start2DMode();
void Start3DMode();
......
......@@ -49,6 +49,12 @@ if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.0.2/tru64_4
fi
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
##
## Use VisIt's Python
##
......
......@@ -49,6 +49,12 @@ if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.0.2/tru64_4
fi
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
##
## Use VisIt's Python
##
......
......@@ -49,6 +49,12 @@ if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.0.2/tru64_4
fi
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
##
## Use VisIt's Python
##
......
......@@ -49,6 +49,12 @@ if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.0.2/tru64_4
fi
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
##
## Use VisIt's Python
##
......
......@@ -15653,7 +15653,8 @@ COMPONENT_FILES="components/Makefile
components/Preprocessor/Makefile
components/Queries/Makefile
components/View/Makefile
components/VisWindow/Makefile"
components/VisWindow/Makefile
components/QtVisWindow/Makefile"
PLOT_FILES="plots/Makefile"
OPERATOR_FILES="operators/Makefile"
DATABASE_FILES="databases/Makefile"
......
......@@ -468,6 +468,9 @@ dnl Mark C. Miller, Thu Feb 26 10:44:14 PDT 2004
dnl Modified to defualt to using PDB lite (in libsilo.a) but still
dnl accept --with-pdb option if PDB proper is desired
dnl
dnl Hank Childs, Thu Mar 4 08:32:01 PST 2004
dnl Added new Qt VisWindow library.
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -2622,7 +2625,8 @@ COMPONENT_FILES="components/Makefile
components/Preprocessor/Makefile
components/Queries/Makefile
components/View/Makefile
components/VisWindow/Makefile"
components/VisWindow/Makefile
components/QtVisWindow/Makefile"
PLOT_FILES="plots/Makefile"
OPERATOR_FILES="operators/Makefile"
DATABASE_FILES="databases/Makefile"
......
......@@ -191,6 +191,9 @@
# Eric Brugger, Thu Jan 29 13:38:33 PST 2004
# Fix a bug in the dependencies so that it builds properly in parallel.
#
# Hank Childs, Wed Feb 25 07:39:03 PST 2004
# Remove Qt dependence in VisWindow.
#
##############################################################################
##
......@@ -209,14 +212,14 @@ CPPFLAGS= -I@tmpinc@ @ENGINE_CPPFLAGS@ @CPPFLAGS@ \
SERLIBS=-L../../lib -lplugin -lviswindow -lavtmath_ser -lplotter \
-ldatabase_ser -lmir -lquery_ser -lexpressions_ser -lavtfilters_ser \
-lpipeline_ser -lavtview -lavtwriter -lvisit_vtk -llightweight_visit_vtk \
-lvtkqt -lwinutil @QT_LIBS@ -lenginerpc -lutility -lmisc -lcomm -lstate \
-lenginerpc -lutility -lmisc -lcomm -lstate \
-lengineparstate_ser -ldbatts -lavtexceptions -lparser @VTK_LIBS@ $(X_LIBS) \
@LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -lplugin -lviswindow -lavtmath_ser -lplotter \
-ldatabase_par -lmir -lquery_par -lexpressions_par -lavtfilters_par \
-lpipeline_par -lavtview -lavtwriter -lvisit_vtk -llightweight_visit_vtk \
-lvtkqt @QT_LIBS@ -lwinutil -lenginerpc -lutility -lmisc -lcomm -lstate \
-lenginerpc -lutility -lmisc -lcomm -lstate \
-lengineparstate_par -ldbatts -lavtexceptions -lparser @VTK_LIBS@ $(X_LIBS) \
@LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
......
......@@ -76,6 +76,9 @@ static double RenderBalance(int numTrianglesIHave);
// Hank Childs, Mon Jan 5 16:04:57 PST 2004
// Initialize uniqueNetworkId.
//
// Hank Childs, Thu Mar 4 09:11:46 PST 2004
// Change instantiation of vis window, since it is now assumed to be nowin.
//
// ****************************************************************************
NetworkManager::NetworkManager(void) : virtualDatabases()
{
......@@ -87,7 +90,7 @@ NetworkManager::NetworkManager(void) : virtualDatabases()
// stuff to support scalable rendering
{
viswin = new VisWindow(true);
viswin = new VisWindow();
AnnotationAttributes newAtts = *(viswin->GetAnnotationAtts());
newAtts.SetUserInfoFlag(false);
newAtts.SetDatabaseInfoFlag(false);
......
......@@ -24,6 +24,7 @@
#include <avtCallback.h>
#include <avtParallel.h>
#include <avtExtents.h>
using std::string;
using std::vector;
......@@ -552,6 +553,9 @@ avtOnionPeelFilter::VerifyInput()
// Grab the return value of UnifyMaximumValue so that this code
// will work correctly in parallel.
//
// Kathleen Bonnell, Thu Mar 4 14:37:41 PST 2004
// Added hack to get around data extents problem in parallel.
//
// ****************************************************************************
void
......@@ -594,6 +598,28 @@ avtOnionPeelFilter::PostExecute()
}
}
// THIS IS A HACK THAT CAN BE REMOVED WHEN THE EXTENTS SETTING/GETTING
// HAS BEEN MODIFIED SO THAT TRUE DATA EXTENTS WILL ALWAYS BE AVAILABLE
// DESPITE SIL RESTRICTIONS AND THE ORDER IN WHICH OPERATIONS ARE PERFORMED.
//
// This filter restricts domains, and if number of domains < number of
// processors, then the TRUE data extents may be lost after this filter
// (from processors no longer working on data).
// A way to ensure that the TRUE data extents are still available after
// execution of this filter, is to retrieve them now (using
// avtFilter::GetDataExtents() which will return the accumulated
// data range from all processors if this information is available).
// Then, clear out the TRUE extents, and set Cummulative True extents.
//
#ifdef PARALLEL
avtDataAttributes &dataAtts = GetOutput()->GetInfo().GetAttributes();
double *ext = new double[2*dataAtts.GetVariableDimension()];
GetDataExtents(ext);
dataAtts.GetTrueDataExtents()->Clear();
dataAtts.GetCumulativeTrueDataExtents()->Set(ext);
delete [] ext;
#endif
}
......
......@@ -224,6 +224,9 @@
# Hank Childs, Sat Jan 24 11:34:44 PST 2004
# Changed link-line to accomodate library re-organization.
#
# Hank Childs, Thu Mar 4 08:08:19 PST 2004
# Add a new library for a Qt vis window.
#
##############################################################################
##
......@@ -240,7 +243,8 @@ LIB=libviewer
VTK_LIBS=@VTK_LIBS@
VTK_INCLUDE=@VTK_INCLUDES@
LIBS=-L../../lib -L../../vtkqt -lengineproxy -lenginerpc -lviewerrpc \
-lmdserverproxy -lmdserverrpc -lvclproxy -lvclrpc -ldbatts -lparser -lplugin -lviswindow \
-lmdserverproxy -lmdserverrpc -lvclproxy -lvclrpc -ldbatts -lparser \
-lplugin -lqtviswindow -lviswindow \
-lavtmath_ser -lplotter -lavtfilters_ser -lavtwriter -lavtview \
-lpipeline_ser -lvisit_vtk -llightweight_visit_vtk -lvtkqt -lwinutil \
@QT_LIBS@ -lproxybase -lmisc -lcomm -lstate -lutility -lavtexceptions \
......
......@@ -40,6 +40,7 @@ using std::string;
#include <ViewerWindowManager.h>
#include <VisItException.h>
#include <VisWindow.h>
#include <QtVisWindow.h>
#include <DebugStream.h>
......@@ -166,11 +167,22 @@ static void RotateAroundY(const avtView3D&, double, avtView3D&);
// Brad Whitlock, Wed Jan 7 09:52:59 PDT 2004
// I initialized pickFunction and pickFunctionData.
//
// Hank Childs, Thu Mar 4 08:10:34 PST 2004
// Use a QtVisWindow.
//
// ****************************************************************************
ViewerWindow::ViewerWindow(int windowIndex)
{
visWindow = new VisWindow(doNoWinMode);
if (doNoWinMode)
{
visWindow = new VisWindow();
}
else
{
visWindow = new QtVisWindow();
}
visWindow->SetCloseCallback(CloseCallback, (void *)this);
visWindow->SetHideCallback(HideCallback, (void *)this);
visWindow->SetShowCallback(ShowCallback, (void *)this);
......
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