← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/ipointglyph.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/ipointglyph.cpp
82
82
using namespace iPointGlyph_Private;
83
83
 
84
84
 
85
 
iPointGlyph* iPointGlyph::New()
 
85
iPointGlyph* iPointGlyph::New(iViewSubject *vo)
86
86
{
87
 
        return new iPointGlyph();
 
87
        return new iPointGlyph(vo);
88
88
}
89
89
 
90
90
 
91
 
iPointGlyph::iPointGlyph()
 
91
iPointGlyph::iPointGlyph(iViewSubject *vo) : iGenericSource<vtkPolyDataSource,vtkPolyData>(vo,false)
92
92
{
93
93
        int i;
94
94
 
97
97
        for(i=0; i<__NumPointTypes; i++) 
98
98
        {
99
99
                if(type[i].Type != i) vtkErrorMacro("Incorrectly configured object.");
100
 
                mData[i] = vtkPolyData::New(); IERROR_ASSERT_NULL_POINTER(mData[i]);
 
100
                mData[i] = vtkPolyData::New(); IERROR_ASSERT(mData[i]);
101
101
        }
102
102
 
103
103
        this->CreateData(3);
133
133
        //
134
134
        //  Sphere
135
135
        //
136
 
        vtkSphereSource *ss = vtkSphereSource::New(); IERROR_ASSERT_NULL_POINTER(ss);
 
136
        vtkSphereSource *ss = vtkSphereSource::New(); IERROR_ASSERT(ss);
137
137
        ss->SetThetaResolution(12*res);
138
138
        ss->SetPhiResolution(6*res);
139
139
        ss->SetRadius(0.5);
146
146
        //
147
147
        //  Platonic solids
148
148
        //
149
 
        vtkPlatonicSolidSource *ps = vtkPlatonicSolidSource::New(); IERROR_ASSERT_NULL_POINTER(ps);
150
 
        vtkPolyDataNormals *pn = vtkPolyDataNormals::New(); IERROR_ASSERT_NULL_POINTER(pn);
 
149
        vtkPlatonicSolidSource *ps = vtkPlatonicSolidSource::New(); IERROR_ASSERT(ps);
 
150
        vtkPolyDataNormals *pn = vtkPolyDataNormals::New(); IERROR_ASSERT(pn);
151
151
        pn->AutoOrientNormalsOn();
152
152
        pn->ConsistencyOn();
153
153
        pn->ComputePointNormalsOff();
204
204
        //
205
205
        //  Cone
206
206
        //
207
 
        vtkConeSource *cs = vtkConeSource::New(); IERROR_ASSERT_NULL_POINTER(cs);
 
207
        vtkConeSource *cs = vtkConeSource::New(); IERROR_ASSERT(cs);
208
208
        cs->SetResolution(6*res);
209
209
        cs->SetOutput(mData[_PointTypeCone]);
210
210
        cs->Update();
217
217
        //
218
218
        //  Cylinder
219
219
        //
220
 
        vtkCylinderSource *ts = vtkCylinderSource::New(); IERROR_ASSERT_NULL_POINTER(ts);
 
220
        vtkCylinderSource *ts = vtkCylinderSource::New(); IERROR_ASSERT(ts);
221
221
        ts->SetResolution(6*res);
222
222
        ts->SetOutput(mData[_PointTypeCylinder]);
223
223
        ts->Update();
229
229
        //
230
230
        //  Arrow
231
231
        //
232
 
        vtkArrowSource *as = vtkArrowSource::New(); IERROR_ASSERT_NULL_POINTER(as);
 
232
        vtkArrowSource *as = vtkArrowSource::New(); IERROR_ASSERT(as);
233
233
        as->SetTipResolution(6*res);
234
234
        as->SetShaftResolution(6*res);
235
235
        as->SetTipRadius(0.5);
246
246
        //  Point
247
247
        //
248
248
        vtkPointSource *cc;
249
 
        cc = vtkPointSource::New(); IERROR_ASSERT_NULL_POINTER(cc);
 
249
        cc = vtkPointSource::New(); IERROR_ASSERT(cc);
250
250
        cc->SetNumberOfPoints(1);
251
251
        cc->SetCenter(0.0,0.0,0.0);
252
252
        cc->SetRadius(1.0);
260
260
        //
261
261
        //  Cluster
262
262
        //
263
 
        cc = vtkPointSource::New(); IERROR_ASSERT_NULL_POINTER(cc);
 
263
        cc = vtkPointSource::New(); IERROR_ASSERT(cc);
264
264
        cc->SetNumberOfPoints(30*res);
265
265
        cc->SetCenter(0.0,0.0,0.0);
266
266
        cc->SetRadius(1.0);
287
287
        //
288
288
        //  Galaxy
289
289
        //
290
 
        cc = vtkPointSource::New(); IERROR_ASSERT_NULL_POINTER(cc);
 
290
        cc = vtkPointSource::New(); IERROR_ASSERT(cc);
291
291
        cc->SetNumberOfPoints(30*res);
292
292
        cc->SetCenter(0.0,0.0,0.0);
293
293
        cc->SetRadius(1.0);
511
511
}
512
512
 
513
513
 
514
 
void iPointGlyph::ProduceOutput(vtkPolyData *output)
 
514
void iPointGlyph::ProduceOutput()
515
515
{
516
 
        output->ShallowCopy(mData[mType]);
 
516
        this->GetOutput()->ShallowCopy(mData[mType]);
517
517
}
518
518