Changeset 2800 for trunk/packages/vizservers/nanovis/Command.cpp
- Timestamp:
- Mar 6, 2012, 2:04:43 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/Command.cpp
r2798 r2800 85 85 86 86 // in nanovis.cpp 87 extern vector<PointSet*> g_pointSet;87 extern std::vector<PointSet*> g_pointSet; 88 88 89 89 extern PlaneRenderer* plane_render; … … 364 364 static int 365 365 GetVolumes(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, 366 vector<Volume *>* vectorPtr)366 std::vector<Volume *>* vectorPtr) 367 367 { 368 368 if (objc == 0) { … … 405 405 static int 406 406 GetHeightMaps(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, 407 vector<HeightMap *>* vectorPtr)407 std::vector<HeightMap *>* vectorPtr) 408 408 { 409 409 if (objc == 0) { … … 737 737 } 738 738 739 vector<Volume *> ivol;739 std::vector<Volume *> ivol; 740 740 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 741 741 return TCL_ERROR; 742 742 } 743 vector<Volume *>::iterator iter;743 std::vector<Volume *>::iterator iter; 744 744 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 745 745 (*iter)->move_cutplane(axis, relval); … … 765 765 } 766 766 767 vector<Volume *> ivol;767 std::vector<Volume *> ivol; 768 768 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 769 769 return TCL_ERROR; 770 770 } 771 771 if (state) { 772 vector<Volume *>::iterator iter;772 std::vector<Volume *>::iterator iter; 773 773 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 774 774 (*iter)->enable_cutplane(axis); 775 775 } 776 776 } else { 777 vector<Volume *>::iterator iter;777 std::vector<Volume *>::iterator iter; 778 778 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 779 779 (*iter)->disable_cutplane(axis); … … 1087 1087 Tcl_Obj *const *objv) 1088 1088 { 1089 vector<Volume *> volumes;1089 std::vector<Volume *> volumes; 1090 1090 if (GetVolumes(interp, objc - 3, objv + 3, &volumes) != TCL_OK) { 1091 1091 return TCL_ERROR; … … 1277 1277 return TCL_ERROR; 1278 1278 } 1279 vector<Volume *> ivol;1279 std::vector<Volume *> ivol; 1280 1280 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1281 1281 return TCL_ERROR; 1282 1282 } 1283 vector<Volume *>::iterator iter;1283 std::vector<Volume *>::iterator iter; 1284 1284 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1285 1285 (*iter)->data_enabled(state); … … 1393 1393 return TCL_ERROR; 1394 1394 } 1395 vector<Volume *> ivol;1395 std::vector<Volume *> ivol; 1396 1396 if (GetVolumes(interp, objc - 6, objv + 6, &ivol) != TCL_OK) { 1397 1397 return TCL_ERROR; 1398 1398 } 1399 vector<Volume *>::iterator iter;1399 std::vector<Volume *>::iterator iter; 1400 1400 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1401 1401 (*iter)->set_outline_color(rgb); … … 1412 1412 return TCL_ERROR; 1413 1413 } 1414 vector<Volume *> ivol;1414 std::vector<Volume *> ivol; 1415 1415 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1416 1416 return TCL_ERROR; 1417 1417 } 1418 vector<Volume *>::iterator iter;1418 std::vector<Volume *>::iterator iter; 1419 1419 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1420 1420 (*iter)->outline(state); … … 1454 1454 } 1455 1455 1456 vector<Volume *> ivol;1456 std::vector<Volume *> ivol; 1457 1457 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1458 1458 return TCL_ERROR; 1459 1459 } 1460 vector<Volume *>::iterator iter;1460 std::vector<Volume *>::iterator iter; 1461 1461 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1462 1462 (*iter)->diffuse(diffuse); … … 1473 1473 return TCL_ERROR; 1474 1474 } 1475 vector<Volume *> ivol;1475 std::vector<Volume *> ivol; 1476 1476 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1477 1477 return TCL_ERROR; 1478 1478 } 1479 vector<Volume *>::iterator iter;1479 std::vector<Volume *>::iterator iter; 1480 1480 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1481 1481 (*iter)->isosurface(iso_surface); … … 1494 1494 } 1495 1495 TRACE("set opacity %f\n", opacity); 1496 vector<Volume *> ivol;1496 std::vector<Volume *> ivol; 1497 1497 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1498 1498 return TCL_ERROR; 1499 1499 } 1500 vector<Volume *>::iterator iter;1500 std::vector<Volume *>::iterator iter; 1501 1501 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1502 1502 (*iter)->opacity_scale(opacity); … … 1513 1513 return TCL_ERROR; 1514 1514 } 1515 vector<Volume *> ivol;1515 std::vector<Volume *> ivol; 1516 1516 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1517 1517 return TCL_ERROR; 1518 1518 } 1519 vector<Volume *>::iterator iter;1519 std::vector<Volume *>::iterator iter; 1520 1520 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1521 1521 (*iter)->specular(specular); … … 1536 1536 return TCL_ERROR; 1537 1537 } 1538 vector<Volume *> ivol;1538 std::vector<Volume *> ivol; 1539 1539 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { 1540 1540 return TCL_ERROR; 1541 1541 } 1542 vector<Volume *>::iterator iter;1542 std::vector<Volume *>::iterator iter; 1543 1543 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1544 1544 TRACE("setting %s with transfer function %s\n", (*iter)->name(), … … 1591 1591 return TCL_ERROR; 1592 1592 } 1593 vector<Volume *> ivol;1593 std::vector<Volume *> ivol; 1594 1594 if (GetVolumes(interp, objc - 5, objv + 5, &ivol) != TCL_OK) { 1595 1595 return TCL_ERROR; 1596 1596 } 1597 vector<Volume *>::iterator iter;1597 std::vector<Volume *>::iterator iter; 1598 1598 const char *label; 1599 1599 label = Tcl_GetString(objv[4]); … … 1617 1617 return TCL_ERROR; 1618 1618 } 1619 vector<Volume *> ivol;1619 std::vector<Volume *> ivol; 1620 1620 if (GetVolumes(interp, objc - 3, objv + 3, &ivol) != TCL_OK) { 1621 1621 return TCL_ERROR; 1622 1622 } 1623 vector<Volume *>::iterator iter;1623 std::vector<Volume *>::iterator iter; 1624 1624 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1625 1625 (*iter)->visible(state); … … 1750 1750 return TCL_ERROR; 1751 1751 } 1752 vector<HeightMap *> imap;1752 std::vector<HeightMap *> imap; 1753 1753 if (GetHeightMaps(interp, objc - 4, objv + 4, &imap) != TCL_OK) { 1754 1754 return TCL_ERROR; 1755 1755 } 1756 vector<HeightMap *>::iterator iter;1756 std::vector<HeightMap *>::iterator iter; 1757 1757 for (iter = imap.begin(); iter != imap.end(); iter++) { 1758 1758 (*iter)->setVisible(visible); … … 1791 1791 return TCL_ERROR; 1792 1792 } 1793 vector<HeightMap *> imap;1793 std::vector<HeightMap *> imap; 1794 1794 if (GetHeightMaps(interp, objc - 6, objv + 6, &imap) != TCL_OK) { 1795 1795 return TCL_ERROR; 1796 1796 } 1797 vector<HeightMap *>::iterator iter;1797 std::vector<HeightMap *>::iterator iter; 1798 1798 for (iter = imap.begin(); iter != imap.end(); iter++) { 1799 1799 (*iter)->setLineContourColor(rgb); … … 1811 1811 return TCL_ERROR; 1812 1812 } 1813 vector<HeightMap *> imap;1813 std::vector<HeightMap *> imap; 1814 1814 if (GetHeightMaps(interp, objc - 4, objv + 4, &imap) != TCL_OK) { 1815 1815 return TCL_ERROR; 1816 1816 } 1817 vector<HeightMap *>::iterator iter;1817 std::vector<HeightMap *>::iterator iter; 1818 1818 for (iter = imap.begin(); iter != imap.end(); iter++) { 1819 1819 (*iter)->setLineContourVisible(visible); … … 2018 2018 return TCL_ERROR; 2019 2019 } 2020 vector<HeightMap *> imap;2020 std::vector<HeightMap *> imap; 2021 2021 if (GetHeightMaps(interp, objc - 3, objv + 3, &imap) != TCL_OK) { 2022 2022 return TCL_ERROR; 2023 2023 } 2024 vector<HeightMap *>::iterator iter;2024 std::vector<HeightMap *>::iterator iter; 2025 2025 for (iter = imap.begin(); iter != imap.end(); iter++) { 2026 2026 (*iter)->transferFunction(tfPtr); … … 2039 2039 return TCL_ERROR; 2040 2040 } 2041 vector<HeightMap *> heightmaps;2041 std::vector<HeightMap *> heightmaps; 2042 2042 if (GetHeightMaps(interp, objc - 3, objv + 3, &heightmaps) != TCL_OK) { 2043 2043 return TCL_ERROR; 2044 2044 } 2045 vector<HeightMap *>::iterator iter;2045 std::vector<HeightMap *>::iterator iter; 2046 2046 for (iter = heightmaps.begin(); iter != heightmaps.end(); iter++) { 2047 2047 (*iter)->opacity(opacity);
Note: See TracChangeset
for help on using the changeset viewer.