Commit a80149cd authored by Mark Hymers's avatar Mark Hymers

import 3.3.4

Signed-off-by: Mark Hymers's avatarMark Hymers <mhy@debian.org>
parent afac3e3d
This diff is collapsed.
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......@@ -248,34 +248,6 @@ iEventObserver* iShellFactory::CreateEventObserver(const iString &type, iViewMod
}
}
if(type == "Record")
{
if(shell->Type() == qt)
{
#if ISHELL_INCLUDED(ISHELL_QT)
return new iggRecordEventObserver(vm);
#else
return 0;
#endif
}
if(shell->Type() == cl)
{
#if ISHELL_INCLUDED(ISHELL_CL)
return new iclRecordEventObserver(vm);
#else
return 0;
#endif
}
if(shell->Type() == fx)
{
#if ISHELL_INCLUDED(ISHELL_FX)
return new iggRecordEventObserver(vm);
#else
return 0;
#endif
}
}
if(type == "Animator")
{
if(shell->Type() == qt)
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......@@ -57,7 +57,6 @@ class iShellFactory
friend class iParallelUpdateEventObserver;
friend class iPickEventObserver;
friend class iProgressEventObserver;
friend class iRecordEventObserver;
friend class iRenderTool;
friend class iShell;
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......@@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// IFrIT version
//
#define IVERSION_BASE "3.3.2"
#define IVERSION_BASE "3.3.4"
#define IVERSION_EXT_ART "2.3.1"
#define IVERSION_EXT_MV "1.2.1"
......@@ -144,6 +144,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// all extraneous functions in iggRenderWindow, re-factored the stereo mode to
// fix the flicker reported by Doug and stereo non-recongnition reported by Patrick.
//
// 100722 Base-3.3.3 ART-2.3.1 MV-1.2.1 VTK-1.1.0 GADGET-1.1.0
// Fixed a bug with Qt4 under Unix
//
// 100818 Base-3.3.4 ART-2.3.1 MV-1.2.1 VTK-1.1.0 GADGET-1.1.0
// Fixed a bug with crashes in cross section, reported by Robyn
// Ported to VTK 5.6.1, added GPU Volume rendering support
// Removed Event Recorder as it caused compilation errors on some compilers
//
//
// ToDo (major additions)
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......@@ -71,6 +71,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define IVTK_PRE56
#endif
#if defined(IVTK_PRE56) || (VTK_MAJOR_VERSION==5 && VTK_MINOR_VERSION==6 && VTK_BUILD_VERSION==0)
#define IVTK_PRE561
#endif
#define IVTK_QUAD_ORDER 3
......
//LICENSE A
#include "iactorcollection.h"
#include "iactor.h"
//
// Templates
//
#include "iarraytemplate.h"
iActorCollection* iActorCollection::New()
{
return new iActorCollection();
}
iActorCollection::iActorCollection()
{
}
iActorCollection::~iActorCollection()
{
int i;
for(i=0; i<mActors.Size(); i++) mActors[i]->UnRegister(this);
}
void iActorCollection::SetVisibility(bool s)
{
int i;
for(i=0; i<mActors.Size(); i++) mActors[i]->SetVisibility(s?1:0);
}
void iActorCollection::AddActor(iActor *a)
{
if(a != 0)
{
mActors.AddUnique(a);
a->Register(this);
}
}
void iActorCollection::RemoveActor(iActor *a)
{
if(a != 0)
{
if(mActors.Remove(a)) a->UnRegister(this);
}
}
//LICENSE A
//
// A simple collection of iActors
//
#ifndef IACTORCOLLECTION_H
#define IACTORCOLLECTION_H
#include <vtkObject.h>
#include "iarray.h"
class iActor;
class iActorCollection : public vtkObject
{
public:
vtkTypeMacro(iActorCollection,vtkObject);
static iActorCollection* New();
void SetVisibility(bool s);
void AddActor(iActor *a);
void RemoveActor(iActor *a);
protected:
virtual ~iActorCollection();
private:
iActorCollection();
iPointerArray<iActor> mActors;
};
#endif // IACTORCOLLECTION_H
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2006 Nick Gnedin
Copyright (c) 2002-2011 Nick Gnedin
All rights reserved.