Skip to content

Commit 434a4ec

Browse files
Xuan HuangXuan Huang
Xuan Huang
authored and
Xuan Huang
committed
clean up
1 parent d8839fd commit 434a4ec

File tree

15 files changed

+51
-452
lines changed

15 files changed

+51
-452
lines changed

‎src/Core/Algorithms/Visualization/OsprayDataAlgorithm.cc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ OsprayGeometryObjectHandle OsprayDataAlgorithm::addStructVol(FieldHandle field,
383383
obj->tfn.colors = cmp.colorList;
384384

385385
// set default opacity for now
386-
// obj->tfn.opacities = cmp.opacityList;
386+
// alpha pushed twice for both upper and lower values
387387
auto alpha = static_cast<float>(get(Parameters::DefaultColorA).toDouble());
388388
obj->tfn.opacities.push_back(alpha);
389389
obj->tfn.opacities.push_back(alpha);
@@ -438,6 +438,10 @@ OsprayGeometryObjectHandle OsprayDataAlgorithm::addUnstructVol(FieldHandle field
438438

439439
for (vmesh->begin(meshCellIter); meshCellIter != meshCellEnd; ++meshCellIter)
440440
{
441+
// OSPRay require an index array of size 8
442+
// for each unstructured mesh cell
443+
// a tetrahedral cell's first 4 vertices are set to -1
444+
// a wedge cell's first 2 vertices are set to -2
441445
VMesh::Cell::index_type elemID = *meshCellIter;
442446
VMesh::Node::array_type nodesFromCell(8);
443447
vmesh->get_nodes(nodesFromCell, elemID);
@@ -453,7 +457,7 @@ OsprayGeometryObjectHandle OsprayDataAlgorithm::addUnstructVol(FieldHandle field
453457
obj->tfn.colors = cmp.colorList;
454458

455459
// set default opacity for now
456-
// obj->tfn.opacities = cmp.opacityList;
460+
// alpha pushed twice for both upper and lower values
457461
auto alpha = static_cast<float>(get(Parameters::DefaultColorA).toDouble());
458462
obj->tfn.opacities.push_back(alpha);
459463
obj->tfn.opacities.push_back(alpha);
@@ -576,6 +580,7 @@ OsprayGeometryObjectHandle OsprayDataAlgorithm::fillDataBuffers(FieldHandle fiel
576580
{
577581
auto nodes = face.nodeIndices();
578582
if(info.is_quadsurfmesh()){
583+
// quad face added in reverse order for correct normal in OSPRay viewer
579584
index.push_back(static_cast<int32_t>(nodes[3]));
580585
index.push_back(static_cast<int32_t>(nodes[2]));
581586
index.push_back(static_cast<int32_t>(nodes[1]));

‎src/Core/Datatypes/ColorMap.cc‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,3 +343,45 @@ double ColorMap::getColorMapShift() const { return shift_; }
343343
bool ColorMap::getColorMapInvert() const { return invert_; }
344344
double ColorMap::getColorMapRescaleScale() const { return rescale_scale_; }
345345
double ColorMap::getColorMapRescaleShift() const { return rescale_shift_; }
346+
347+
348+
349+
ColorMap_OSP_helper::ColorMap_OSP_helper(const std::string name){
350+
opacityList.push_back(0.5);
351+
opacityList.push_back(0.5);
352+
if(name.compare("Rainbow") == 0){
353+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
354+
colorList.push_back(0); colorList.push_back(0.75); colorList.push_back(0.75);
355+
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
356+
colorList.push_back(1); colorList.push_back(0.5); colorList.push_back(0);
357+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
358+
}else if(name.compare("Old Rainbow") == 0){
359+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
360+
colorList.push_back(0); colorList.push_back(1); colorList.push_back(1);
361+
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
362+
colorList.push_back(1); colorList.push_back(1); colorList.push_back(0);
363+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
364+
}else if(name.compare("Blackbody") == 0){
365+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
366+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
367+
colorList.push_back(1); colorList.push_back(1); colorList.push_back(0);
368+
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);
369+
}else if(name.compare("Grayscale") == 0){
370+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
371+
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);
372+
}else if(name.compare("Orange,Black,Lime") == 0){
373+
colorList.push_back(1); colorList.push_back(0.5); colorList.push_back(0);
374+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
375+
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
376+
}else if(name.compare("Darkhue") == 0){
377+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
378+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0.333333);
379+
colorList.push_back(0.5); colorList.push_back(0); colorList.push_back(0.5);
380+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
381+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0.25*2.6666666);
382+
}else if(name.compare("BP Seismic") == 0){
383+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
384+
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);
385+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
386+
}
387+
}

‎src/Core/Datatypes/ColorMap.h‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -125,45 +125,7 @@ namespace Datatypes {
125125
public:
126126
std::vector<float> colorList;
127127
std::vector<float> opacityList;
128-
ColorMap_OSP_helper(const std::string name){
129-
opacityList.push_back(0.5);
130-
opacityList.push_back(0.5);
131-
if(name.compare("Rainbow") == 0){
132-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
133-
colorList.push_back(0); colorList.push_back(0.75); colorList.push_back(0.75);
134-
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
135-
colorList.push_back(1); colorList.push_back(0.5); colorList.push_back(0);
136-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
137-
}else if(name.compare("Old Rainbow") == 0){
138-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
139-
colorList.push_back(0); colorList.push_back(1); colorList.push_back(1);
140-
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
141-
colorList.push_back(1); colorList.push_back(1); colorList.push_back(0);
142-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
143-
}else if(name.compare("Blackbody") == 0){
144-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
145-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
146-
colorList.push_back(1); colorList.push_back(1); colorList.push_back(0);
147-
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);
148-
}else if(name.compare("Grayscale") == 0){
149-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
150-
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);
151-
}else if(name.compare("Orange,Black,Lime") == 0){
152-
colorList.push_back(1); colorList.push_back(0.5); colorList.push_back(0);
153-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
154-
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
155-
}else if(name.compare("Darkhue") == 0){
156-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
157-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0.333333);
158-
colorList.push_back(0.5); colorList.push_back(0); colorList.push_back(0.5);
159-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
160-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0.25*2.6666666);
161-
}else if(name.compare("BP Seismic") == 0){
162-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
163-
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);
164-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
165-
}
166-
}
128+
ColorMap_OSP_helper(const std::string name);
167129
};
168130

169131
}}}

‎src/Interface/Modules/Render/OsprayViewerDialog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ void OsprayViewerDialog::createViewer(const CompositeOsprayGeometryObject& geom)
483483

484484
setupViewer(viewer_);
485485

486-
SCIRun::LOG_DEBUG("num of vol: "+std::to_string(vol_list.size()));
486+
SCIRun::LOG_DEBUG("num of vol: {}", vol_list.size());
487487
// load volume here
488488
for(int i=0;i<vol_list.size();i++){
489489
viewer_->loadVolume(vol_list[i], voxelRange_list[i].toVec2f(), bounds_list[i]);

‎src/Interface/Modules/String/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ SET(Interface_Modules_String_FORMS
3434
PrintMatrixIntoStringDialog.ui
3535
PrintStringIntoStringDialog.ui
3636
ReportStringInfo.ui
37-
ModuleTestUIDialog.ui
3837
)
3938

4039
SET(Interface_Modules_String_HEADERS
@@ -45,7 +44,6 @@ SET(Interface_Modules_String_HEADERS
4544
PrintMatrixIntoStringDialog.h
4645
PrintStringIntoStringDialog.h
4746
ReportStringInfoDialog.h
48-
ModuleTestUIDialog.h
4947
)
5048

5149
SET(Interface_Modules_String_SOURCES
@@ -55,7 +53,6 @@ SET(Interface_Modules_String_SOURCES
5553
PrintMatrixIntoStringDialog.cc
5654
PrintStringIntoStringDialog.cc
5755
ReportStringInfoDialog.cc
58-
ModuleTestUIDialog.cc
5956
)
6057

6158
QT_WRAP_UI(Interface_Modules_String_FORMS_HEADERS "${Interface_Modules_String_FORMS}")

‎src/Interface/Modules/String/ModuleTestUIDialog.cc‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎src/Interface/Modules/String/ModuleTestUIDialog.h‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/Interface/Modules/String/ModuleTestUIDialog.ui‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/Modules/Factory/Config/ModuleTest.module‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/Modules/Factory/Config/ModuleTestUI.module‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)