← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ifrit/saucy

« back to all changes in this revision

Viewing changes to core/icamerapath.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mark Hymers
  • Date: 2006-10-28 15:06:32 UTC
  • mfrom: (1.1.4 upstream) (2.1.1 etch)
  • Revision ID: james.westby@ubuntu.com-20061028150632-hyvuhvsv6zpmf5ev
Tags: 3.0.5-1
New upstream version. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/icamerapath.cpp
71
71
{
72
72
        mIsFocalPath = mIsFocalPathToPoint = false;
73
73
 
74
 
        mCamPathWidget = new iSplineWidget; IERROR_ASSERT_NULL_POINTER(mCamPathWidget);
 
74
        mCamPathWidget = new iSplineWidget; IERROR_ASSERT(mCamPathWidget);
75
75
        mCamPathWidget->SetNumberOfHandles(3);
76
76
        mCamPathWidget->SetResolution(mNumIntervalsPerSegment*2);
77
77
        mCamPathWidget->SetInteractor(this->GetViewModule()->GetInteractor());
81
81
        mCamPathWidget->SetHandlePosition(1,0.0,0.0,1.0);
82
82
        mCamPathWidget->SetHandlePosition(0,1.0,0.0,1.0);
83
83
 
84
 
        mFocPathWidget = new iSplineWidget; IERROR_ASSERT_NULL_POINTER(mFocPathWidget);
 
84
        mFocPathWidget = new iSplineWidget; IERROR_ASSERT(mFocPathWidget);
85
85
        mFocPathWidget->SetNumberOfHandles(3);
86
86
        mFocPathWidget->SetResolution(mNumIntervalsPerSegment*2);
87
87
        mFocPathWidget->SetInteractor(this->GetViewModule()->GetInteractor());
98
98
        mFocPathWidget->AddObserver(vtkCommand::EnableEvent,this);
99
99
        mFocPathWidget->AddObserver(vtkCommand::DisableEvent,this);
100
100
 
101
 
        mCamPathData = vtkPolyData::New(); IERROR_ASSERT_NULL_POINTER(mCamPathData);
102
 
        mFocPathData = vtkPolyData::New(); IERROR_ASSERT_NULL_POINTER(mFocPathData);
 
101
        mCamPathData = vtkPolyData::New(); IERROR_ASSERT(mCamPathData);
 
102
        mFocPathData = vtkPolyData::New(); IERROR_ASSERT(mFocPathData);
103
103
                
104
 
        mCamPathHeadActor = iActor::New(true); IERROR_ASSERT_NULL_POINTER(mCamPathHeadActor);
105
 
        mCamPathHeadSource = vtkConeSource::New(); IERROR_ASSERT_NULL_POINTER(mCamPathHeadSource);
 
104
        mCamPathHeadActor = iActor::New(true); IERROR_ASSERT(mCamPathHeadActor);
 
105
        mCamPathHeadSource = vtkConeSource::New(); IERROR_ASSERT(mCamPathHeadSource);
106
106
        mCamPathHeadSource->SetResolution(12);
107
107
        mCamPathHeadSource->SetRadius(0.1);
108
108
        mCamPathHeadSource->SetHeight(0.15);
110
110
        mCamPathHeadActor->GetProperty()->SetColor(0.0,0.68,1.0);
111
111
        mCamPathHeadActor->PickableOff();
112
112
 
113
 
        mFocPathBandActor = iActor::New(); IERROR_ASSERT_NULL_POINTER(mFocPathBandActor);
114
 
        mFocPathBandSource = vtkPolyData::New(); IERROR_ASSERT_NULL_POINTER(mFocPathBandSource);
 
113
        mFocPathBandActor = iActor::New(); IERROR_ASSERT(mFocPathBandActor);
 
114
        mFocPathBandSource = vtkPolyData::New(); IERROR_ASSERT(mFocPathBandSource);
115
115
        mFocPathBandActor->SetInput(mFocPathBandSource);
116
116
        mFocPathBandActor->GetProperty()->SetColor(0.4,0.5,0.6);
117
117
        mFocPathBandActor->PickableOff();
351
351
                                        nstep = cp->GetNumberOfPoints()/n;
352
352
                                }
353
353
 
354
 
                                vtkPoints *newPoints = vtkPoints::New(VTK_FLOAT); IERROR_ASSERT_NULL_POINTER(newPoints);
355
 
                                vtkCellArray *newLines = vtkCellArray::New(); IERROR_ASSERT_NULL_POINTER(newLines);
 
354
                                vtkPoints *newPoints = vtkPoints::New(VTK_FLOAT); IERROR_ASSERT(newPoints);
 
355
                                vtkCellArray *newLines = vtkCellArray::New(); IERROR_ASSERT(newLines);
356
356
                                newPoints->SetNumberOfPoints(2*n);
357
357
                                newLines->Allocate(3*n);
358
358