Changeset 6388 for vtkvis/branches
- Timestamp:
- Jun 16, 2016, 4:49:33 PM (8 years ago)
- Location:
- vtkvis/branches/1.8
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
vtkvis/branches/1.8
- Property svn:mergeinfo changed
/vtkvis/trunk merged: 5073,5075,5753,5761,5791,5813,5816,5822,5824,5827,6162,6192,6378,6383-6384
- Property svn:mergeinfo changed
-
vtkvis/branches/1.8/DataSet.cpp
r5836 r6388 14 14 #include <vtkDataSetReader.h> 15 15 #include <vtkDataSetWriter.h> 16 #include <vtkXMLReader.h> 17 #include <vtkXMLDataReader.h> 18 #include <vtkXMLGenericDataObjectReader.h> 19 #include <vtkXMLDataSetWriter.h> 16 20 #include <vtkPolyData.h> 17 21 #include <vtkStructuredPoints.h> … … 153 157 154 158 _dataSet = reader->GetOutput(); 159 if (_dataSet == NULL) 160 return false; 161 162 if (vtkUnstructuredGrid::SafeDownCast(_dataSet) != NULL && !isCloud()) { 163 vtkSmartPointer<vtkExtractUnstructuredGrid> filter = vtkSmartPointer<vtkExtractUnstructuredGrid>::New(); 164 filter->SetInputData(_dataSet); 165 filter->MergingOn(); 166 filter->ReleaseDataFlagOn(); 167 filter->Update(); 168 _dataSet = filter->GetOutput(); 169 } 170 171 if (_dataSet->GetPointData() != NULL && 172 _dataSet->GetPointData()->GetScalars() != NULL && 173 _dataSet->GetPointData()->GetScalars()->GetLookupTable() != NULL) { 174 USER_ERROR("No lookup table should be specified in VTK data sets"); 175 } 176 177 setDefaultArrays(); 178 179 #ifdef WANT_TRACE 180 print(); 181 #endif 182 TRACE("Leave"); 183 return true; 184 } 185 186 /** 187 * \brief Read dataset using supplied reader 188 * 189 */ 190 bool DataSet::setData(vtkXMLReader *reader) 191 { 192 TRACE("Enter"); 193 reader->Update(); 194 195 _dataSet = reader->GetOutputAsDataSet(); 155 196 if (_dataSet == NULL) 156 197 return false; -
vtkvis/branches/1.8/DataSet.h
r5843 r6388 12 12 #include <vtkDataSet.h> 13 13 #include <vtkDataSetReader.h> 14 #include <vtkXMLReader.h> 14 15 #include <vtkAlgorithmOutput.h> 15 16 #include <vtkTrivialProducer.h> … … 47 48 48 49 bool setData(vtkDataSetReader *reader); 50 51 bool setData(vtkXMLReader *reader); 49 52 50 53 bool setData(vtkDataSet *ds); -
vtkvis/branches/1.8/Makefile.in
r5837 r6388 49 49 -lvtkIOCore-$(VTK_VERSION) \ 50 50 -lvtkIOLegacy-$(VTK_VERSION) \ 51 -lvtkIOXML-$(VTK_VERSION) \ 51 52 -lvtkFiltersExtraction-$(VTK_VERSION) \ 52 53 -lvtkFiltersModeling-$(VTK_VERSION) \ -
vtkvis/branches/1.8/RenderServer.cpp
r4806 r6388 250 250 g_statsFile = open(pathStr.c_str(), O_EXCL | O_CREAT | O_WRONLY, 0600); 251 251 if (g_statsFile < 0) { 252 253 252 ERROR("can't open \"%s\": %s", pathStr.c_str(), strerror(errno)); 253 return -1; 254 254 } 255 255 return g_statsFile; … … 273 273 serverStats(int code) 274 274 { 275 double start, finish;276 275 char buf[BUFSIZ]; 277 276 Tcl_DString ds; 278 277 int result; 279 int f; 280 281 { 282 struct timeval tv; 283 284 /* Get ending time. */ 285 gettimeofday(&tv, NULL); 286 finish = CVT2SECS(tv); 287 tv = g_stats.start; 288 start = CVT2SECS(tv); 289 } 278 279 /* Get ending time. */ 280 struct timeval now; 281 gettimeofday(&now, NULL); 282 double session_time = CVT2SECS(now) - CVT2SECS(g_stats.start); 283 290 284 /* 291 285 * Session information: … … 326 320 /* date */ 327 321 Tcl_DStringAppendElement(&ds, "date"); 328 strcpy(buf, ctime(& g_stats.start.tv_sec));322 strcpy(buf, ctime(&now.tv_sec)); 329 323 buf[strlen(buf) - 1] = '\0'; 330 324 Tcl_DStringAppendElement(&ds, buf); 331 325 /* date_secs */ 332 326 Tcl_DStringAppendElement(&ds, "date_secs"); 333 sprintf(buf, "%ld", g_stats.start.tv_sec);327 sprintf(buf, "%ld", now.tv_sec); 334 328 Tcl_DStringAppendElement(&ds, buf); 335 329 /* num_data_sets */ … … 359 353 /* session_time */ 360 354 Tcl_DStringAppendElement(&ds, "session_time"); 361 sprintf(buf, "%g", finish - start);355 sprintf(buf, "%g", session_time); 362 356 Tcl_DStringAppendElement(&ds, buf); 363 357 /* status */ … … 366 360 Tcl_DStringAppendElement(&ds, buf); 367 361 { 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 362 long clocksPerSec = sysconf(_SC_CLK_TCK); 363 double clockRes = 1.0 / clocksPerSec; 364 struct tms tms; 365 366 memset(&tms, 0, sizeof(tms)); 367 times(&tms); 368 /* utime */ 369 Tcl_DStringAppendElement(&ds, "utime"); 370 sprintf(buf, "%g", tms.tms_utime * clockRes); 371 Tcl_DStringAppendElement(&ds, buf); 372 /* stime */ 373 Tcl_DStringAppendElement(&ds, "stime"); 374 sprintf(buf, "%g", tms.tms_stime * clockRes); 375 Tcl_DStringAppendElement(&ds, buf); 376 /* cutime */ 377 Tcl_DStringAppendElement(&ds, "cutime"); 378 sprintf(buf, "%g", tms.tms_cutime * clockRes); 379 Tcl_DStringAppendElement(&ds, buf); 380 /* cstime */ 381 Tcl_DStringAppendElement(&ds, "cstime"); 382 sprintf(buf, "%g", tms.tms_cstime * clockRes); 383 Tcl_DStringAppendElement(&ds, buf); 390 384 } 391 385 Tcl_DStringAppend(&ds, "\n", -1); 392 f= getStatsFile(NULL);393 result = writeToStatsFile(f , Tcl_DStringValue(&ds),386 int fd = getStatsFile(NULL); 387 result = writeToStatsFile(fd, Tcl_DStringValue(&ds), 394 388 Tcl_DStringLength(&ds)); 395 close(f );389 close(fd); 396 390 Tcl_DStringFree(&ds); 397 391 return result; … … 450 444 if (g_fLog != NULL) { 451 445 fclose(g_fLog); 452 446 g_fLog = NULL; 453 447 } 454 448 } -
vtkvis/branches/1.8/RendererCmd.cpp
r4815 r6388 2353 2353 objPtr = Tcl_NewStringObj(buf, -1); 2354 2354 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 2355 /* date */ 2356 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4)); 2357 strcpy(buf, ctime(&VtkVis::g_stats.start.tv_sec)); 2358 buf[strlen(buf) - 1] = '\0'; 2359 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1)); 2360 /* date_secs */ 2361 Tcl_ListObjAppendElement(interp, listObjPtr, 2362 Tcl_NewStringObj("date_secs", 9)); 2363 Tcl_ListObjAppendElement(interp, listObjPtr, 2364 Tcl_NewLongObj(VtkVis::g_stats.start.tv_sec)); 2355 2365 } else { 2356 2366 objPtr = Tcl_NewStringObj("render_info", 11); 2357 2367 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 2358 } 2359 /* date */ 2360 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4)); 2361 strcpy(buf, ctime(&VtkVis::g_stats.start.tv_sec)); 2362 buf[strlen(buf) - 1] = '\0'; 2363 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1)); 2364 /* date_secs */ 2365 Tcl_ListObjAppendElement(interp, listObjPtr, 2366 Tcl_NewStringObj("date_secs", 9)); 2367 Tcl_ListObjAppendElement(interp, listObjPtr, 2368 Tcl_NewLongObj(VtkVis::g_stats.start.tv_sec)); 2368 struct timeval now; 2369 gettimeofday(&now, NULL); 2370 /* date */ 2371 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4)); 2372 strcpy(buf, ctime(&now.tv_sec)); 2373 buf[strlen(buf) - 1] = '\0'; 2374 Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1)); 2375 /* date_secs */ 2376 Tcl_ListObjAppendElement(interp, listObjPtr, 2377 Tcl_NewStringObj("date_secs", 9)); 2378 Tcl_ListObjAppendElement(interp, listObjPtr, 2379 Tcl_NewLongObj(now.tv_sec)); 2380 } 2369 2381 /* Client arguments. */ 2370 2382 if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) { … … 13181 13193 13182 13194 /** 13183 * \brief Create Tcl interpreter and add commands 13184 * 13185 * \return The initialized Tcl interpreter 13195 * \brief Make Tcl interpreter safe and add commands 13186 13196 */ 13187 13197 void
Note: See TracChangeset
for help on using the changeset viewer.