Working on latvol

Author: dcwhite

src/Modules/Visualization/Tests/OsprayFieldRenderTests.cc

@@ -72,7 +72,8 @@ class OsprayFieldRenderTest : public ParameterizedModuleTest<int>
   {
     Log::get().setVerbose(false);
     auto size = GetParam();
-    latVol = CreateEmptyLatVol(size, size, size);
+    auto max = static_cast<double>(size);
+    latVol = CreateEmptyLatVol(size, size, size, DOUBLE_E, { 0, 0, 0 }, { max, max, max });
     Log::get() << INFO << "Setting up ShowField with size " << size << "^3 latvol" << std::endl;
   }
 
@@ -123,17 +124,18 @@ namespace osprayImpl
 
   int renderLatVol(FieldHandle latvol, float cameraSteps)
   {
-    if (false)
+    FieldHandle trisurf;
+    //if (false)
     {
       GetFieldBoundaryAlgo getfieldbound_algo;
       FieldHandle field_boundary;
       getfieldbound_algo.run(latvol, field_boundary);
       ConvertMeshToTriSurfMeshAlgo converter;
-      FieldHandle trisurf;
+      
       converter.run(field_boundary, trisurf);
     }
 
-    auto trisurf = TriangleTriSurfLinearBasis(DOUBLE_E);
+    //trisurf = TriangleTriSurfLinearBasis(DOUBLE_E);
     auto facade(trisurf->mesh()->getFacade());
 
     //std::ostringstream ostr;
@@ -158,10 +160,10 @@ namespace osprayImpl
     imgSize.y = 768; // height
 
     // camera
-    float cam_pos[] = { -1.f, 0.f, 1.f };
+    float cam_pos[] = { -1.f, 0.f, -5.f };
     cam_pos[0] += cameraSteps;
     float cam_up[] = { 0.f, 1.f, 0.f };
-    float cam_view[] = { 0.5f, 0.5f, -1.f };
+    float cam_view[] = { 0.5f, 0.5f, 1.f };
     //cam_view[2] += cam_pos[2];
 
     // triangle mesh data
@@ -317,7 +319,7 @@ TEST_P(OsprayFieldRenderTest, RenderLatVolWithOspray)
 INSTANTIATE_TEST_CASE_P(
   RenderLatVolWithOspray,
   OsprayFieldRenderTest,
-  Values(2//, 40, 60, 80
+  Values(4//, 40, 60, 80
   //, 100, 120, 150//, //200 //to speed up make test
   //, 256 // probably runs out of memory
   )

src/Testing/Utils/SCIRunFieldSamples.cc

@@ -297,14 +297,14 @@ FieldHandle SCIRun::TestUtils::CreateEmptyLatVol()
   return CreateEmptyLatVol(sizex, sizey, sizez);
 }
 
-FieldHandle SCIRun::TestUtils::CreateEmptyLatVol(size_type sizex, size_type sizey, size_type sizez, data_info_type type)
+FieldHandle SCIRun::TestUtils::CreateEmptyLatVol(size_type sizex, size_type sizey, size_type sizez, data_info_type type,
+  const Core::Geometry::Point& minb, const Core::Geometry::Point& maxb)
 {
   FieldInformation lfi(LATVOLMESH_E, LINEARDATA_E, type);
 
-  Point minb(-1.0, -1.0, -1.0);
-  Point maxb(1.0, 1.0, 1.0);
   MeshHandle mesh = CreateMesh(lfi, sizex, sizey, sizez, minb, maxb);
   FieldHandle ofh = CreateField(lfi, mesh);
   ofh->vfield()->clear_all_values();
   return ofh;
 }
+

src/Testing/Utils/SCIRunFieldSamples.h

@@ -30,6 +30,7 @@
 #define TESTING_UTIL_SCIRUNFIELDSAMPLES 1
 
 #include <Core/Datatypes/Legacy/Field/FieldInformation.h>
+#include <Core/GeometryPrimitives/Point.h>
 
 #include <Testing/Utils/share.h>
 
@@ -90,7 +91,9 @@ SCISHARE FieldHandle TetrahedronTriSurfConstantBasis(data_info_type type);
 SCISHARE FieldHandle TetrahedronTriSurfLinearBasis(data_info_type type);
 
 SCISHARE FieldHandle CreateEmptyLatVol();
-SCISHARE FieldHandle CreateEmptyLatVol(size_type sizex, size_type sizey, size_type sizez, data_info_type type = DOUBLE_E);
+SCISHARE FieldHandle CreateEmptyLatVol(size_type sizex, size_type sizey, size_type sizez, 
+  data_info_type type = DOUBLE_E,
+  const Core::Geometry::Point& minb = { -1, -1, -1 }, const Core::Geometry::Point& maxb = {1,1,1});
 
 }}