Commit cf9614e0 authored by Barry deFreese's avatar Barry deFreese

Imported Debian patch 3.4.2-1

parents f2b365eb 01850497
......@@ -237,6 +237,14 @@ IF(CustomVP1000)
ADD_DEFINITIONS(-DI_CUSTOM_VP1000)
ENDIF(tmp)
ENDIF(CustomVP1000)
IF(Extension:ART)
FILE(GLOB tmp ${src}/special/artio/*.c)
IF(tmp)
SET(sources ${sources} ${tmp})
INCLUDE_DIRECTORIES(${src}/special/artio)
ENDIF(tmp)
ENDIF(Extension:ART)
#
# Create target
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......@@ -33,9 +33,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// IFrIT version
//
#define IVERSION_BASE "3.3.4"
#define IVERSION_BASE "3.4.2"
#define IVERSION_EXT_ART "2.3.1"
#define IVERSION_EXT_ART "2.4.1"
#define IVERSION_EXT_MV "1.2.1"
#define IVERSION_EXT_VTK "1.1.0"
#define IVERSION_EXT_GADGET "1.1.0"
......@@ -152,6 +152,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Ported to VTK 5.6.1, added GPU Volume rendering support
// Removed Event Recorder as it caused compilation errors on some compilers
//
// 120320 Base-3.3.5 ART-2.3.2 MV-1.2.1 VTK-1.1.0 GADGET-1.1.0
// A few bug fixes.
// Ported to VTK 5.8.0, added GPU Volume rendering support
//
// 120809 Base-3.4.0 ART-2.4.0 MV-1.2.1 VTK-1.1.0 GADGET-1.1.0
// Mioved to Mercurial SC
// ARTIO and CART io support
// Some widget modification (FileName, Color)
// Removed CameraPath Animator mode, fixed title page and logo
//
// 121219 Base-3.4.1 ART-2.4.0 MV-1.2.1 VTK-1.1.0 GADGET-1.1.0
// Minor bug fix
//
// 130710 Base-3.4.2 ART-2.4.1 MV-1.2.1 VTK-1.1.0 GADGET-1.1.0
// Added support for selecting sub-volume of the ART mesh, other minor fixes
//
//
// ToDo (major additions)
......
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
//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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 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-2011 Nick Gnedin
Copyright (c) 2002-2012 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@
Language: C++
Copyright (c) 2002-2011 Nick Gnedin
Copyright (c) 2002-2012 Nick Gnedin
All rights reserved.
This file may be distributed and/or modified under the terms of the
......@@ -87,7 +87,7 @@ namespace iAnimatorScript_Private
DEFINE_WORKER_ABS(Animator,SetStyle,int);
DEFINE_WORKER_ABS(Animator,SetNumberOfTitlePageFrames,int);
DEFINE_WORKER_ABS(Animator,SetNumberOfTitlePageBlendedFrames,int);
DEFINE_WORKER_ABS(Animator,SetLogoPosition,int);
DEFINE_WORKER_ABS(Animator,SetLogoLocation,int);
DEFINE_WORKER_ABS(Camera,SetParallelScale,double);
DEFINE_WORKER_ABS(Camera,SetParallelProjection,bool);
DEFINE_WORKER_ABS(Visual,ShowLabel,bool);
......@@ -247,6 +247,7 @@ iAnimatorScript::iAnimatorScript(iAnimator *an) : iBasicScript(an->GetViewModule
this->CreateAliasWord("upper-right-corner","urcorner");
this->CreateAliasWord("lower-left-corner","llcorner");
this->CreateAliasWord("lower-right-corner","lrcorner");
this->CreateAliasWord("logo-position","logo-location");
#endif
//
......@@ -281,9 +282,7 @@ iAnimatorScript::iAnimatorScript(iAnimator *an) : iBasicScript(an->GetViewModule
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("render-all",RenderAll);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("render-set",RenderSet);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("load",Load);
this->AddPrototype< iScriptKit::SimpleStatement >("reset",Reset);
this->AddPrototype< iScriptKit::FunctionCallStatement >("execute control-script",ExecuteControlScript);
this->AddPrototype< iScriptKit::FunctionCallStatement >("embed control-script",EmbedControlScript);
......@@ -318,7 +317,7 @@ iAnimatorScript::iAnimatorScript(iAnimator *an) : iBasicScript(an->GetViewModule
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("title-page-number-of-frames",AnimatorSetNumberOfTitlePageFrames);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("title-page-number-of-blended-frames",AnimatorSetNumberOfTitlePageBlendedFrames);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<float> >("logo-opacity",AnimatorSetLogoOpacity);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("logo-position",AnimatorSetLogoPosition);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<int> >("logo-location",AnimatorSetLogoLocation);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<bool> >("surface",SurfaceShow);
this->AddPrototype< iScriptKit::FunctionCallAssignmentStatement<bool> >("cross-section",CrossSectionShow);
......@@ -376,18 +375,6 @@ bool iAnimatorScript::IsCommandWordLetter(char c) const
}
//
// Reset Animator settings
//
bool iAnimatorScript::Reset(iScript *self)
{
curAnimator->ResetState();
curAnimator->Reset();
curVisual->GetRenderTool()->GetCamera()->Reset();
return true;
}
//
// Render scene
//
......@@ -401,7 +388,7 @@ bool iAnimatorScript::Render(iScript *self, short, int n)
self->GetErrorStatus()->Monitor(curAnimator->GetErrorStatus(),true);
for(i=0; i<n && !self->CheckAbort(i,n,1) && self->GetErrorStatus()->NoError(); i++)
{
if(!curAnimator->RenderImages()) self->GetErrorStatus()->Set("Animation finished.",-1);
if(!curAnimator->Frame()) self->GetErrorStatus()->Set("Animation finished.",-1);
}
curScript->SetInRender(false);
......@@ -424,12 +411,12 @@ bool iAnimatorScript::RenderAll(iScript *self, short, int n)
//
// Force other animators to continue, even if they are done
//
curControl->GetViewModule(k)->GetAnimator()->RenderImages(false);
curControl->GetViewModule(k)->GetAnimator()->Frame(false);
}