Skip to content

Commit 31efa38

Browse files
author
RubioJr9
committed
Merge branch 'linux_closing' of https://github.com/rubiojr9/scirun into linux_closing
2 parents 5cb6f6c + 291340e commit 31efa38

File tree

146 files changed

+9181
-3467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+9181
-3467
lines changed

‎InstallationInstructions‎

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

‎Superbuild/UseBoost.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ foreach(lib ${SCI_BOOST_LIBRARY})
3535
if(WIN32)
3636
set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
3737
set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
38-
else()
38+
else(WIN32)
3939
if (${USER_PYTHON_VERSION} VERSION_GREATER "3.7")
4040
set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
4141
set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
4242
else()
4343
set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python3-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
4444
set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python3-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
4545
endif()
46-
endif()
47-
else()
48-
set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}")
49-
set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
50-
endif()
46+
endif(WIN32)
47+
else() # non-python libraries
48+
set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}")
49+
set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
50+
endif()
5151
endif()
5252

5353
message(STATUS "Configure Boost library ${lib}")

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,8 @@ IF(NOT BUILD_HEADLESS)
508508

509509
IF(Qt5Core_FOUND)
510510
MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
511-
INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
511+
ADD_DEFINITIONS(-DQT5_VERSION=${Qt5Core_VERSION_STRING})
512+
INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
512513
INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
513514
INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
514515
INCLUDE_DIRECTORIES(${Qt5Network_INCLUDE_DIRS})

‎src/Core/Algorithms/Visualization/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ TARGET_LINK_LIBRARIES(Core_Algorithms_Visualization
4848
Core_Datatypes
4949
Core_Datatypes_Legacy_Field
5050
Algorithms_Base
51-
Graphics_Datatypes
5251
${SCI_BOOST_LIBRARY}
5352
)
5453

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@ using namespace SCIRun;
5656
using namespace Core::Algorithms;
5757
using namespace Core::Geometry;
5858
using namespace Visualization;
59+
using namespace OsprayVisualization;
5960
using namespace Core::Datatypes;
6061

61-
ALGORITHM_PARAMETER_DEF(Visualization, DefaultColorR);
62-
ALGORITHM_PARAMETER_DEF(Visualization, DefaultColorG);
63-
ALGORITHM_PARAMETER_DEF(Visualization, DefaultColorB);
64-
ALGORITHM_PARAMETER_DEF(Visualization, DefaultColorA);
65-
ALGORITHM_PARAMETER_DEF(Visualization, Radius);
66-
ALGORITHM_PARAMETER_DEF(Visualization, UseNormals);
67-
ALGORITHM_PARAMETER_DEF(Visualization, ShowEdges);
62+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, DefaultColorR);
63+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, DefaultColorG);
64+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, DefaultColorB);
65+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, DefaultColorA);
66+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, Radius);
67+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, UseNormals);
68+
ALGORITHM_PARAMETER_DEF(OsprayVisualization, ShowEdges);
6869

6970
OsprayDataAlgorithm::OsprayDataAlgorithm()
7071
{

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace SCIRun
4040
{
4141
namespace Algorithms
4242
{
43-
namespace Visualization
43+
namespace OsprayVisualization
4444
{
4545
ALGORITHM_PARAMETER_DECL(DefaultColorR);
4646
ALGORITHM_PARAMETER_DECL(DefaultColorG);
@@ -49,7 +49,10 @@ namespace SCIRun
4949
ALGORITHM_PARAMETER_DECL(Radius);
5050
ALGORITHM_PARAMETER_DECL(UseNormals);
5151
ALGORITHM_PARAMETER_DECL(ShowEdges);
52-
52+
}
53+
54+
namespace Visualization
55+
{
5356
typedef std::pair<int,int> Edge;
5457
typedef std::vector<Edge> EdgeVector;
5558
typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS> DirectedGraph;

‎src/Core/Algorithms/Visualization/RenderFieldState.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ class SCISHARE RenderState
114114
POINT_GLYPH,
115115
SPHERE_GLYPH,
116116
ELLIPSOID_GLYPH,
117+
SUPERELLIPSOID_GLYPH,
117118
BOX_GLYPH,
118119
AXIS_GLYPH,
119120
LINE_GLYPH,

‎src/Core/Datatypes/ColorMap.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,10 @@ ColorMap_OSP_helper::ColorMap_OSP_helper(const std::string& name)
376376
colorList.push_back(0); colorList.push_back(1); colorList.push_back(0);
377377
}else if(name.compare("Darkhue") == 0){
378378
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0);
379-
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0.333333);
379+
colorList.push_back(0); colorList.push_back(0); colorList.push_back(0.333333f);
380380
colorList.push_back(0.5); colorList.push_back(0); colorList.push_back(0.5);
381381
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0);
382-
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0.25*2.6666666);
382+
colorList.push_back(1); colorList.push_back(0); colorList.push_back(0.25f*2.6666666f);
383383
}else if(name.compare("BP Seismic") == 0){
384384
colorList.push_back(0); colorList.push_back(0); colorList.push_back(1);
385385
colorList.push_back(1); colorList.push_back(1); colorList.push_back(1);

‎src/Core/GeometryPrimitives/Transform.cc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,18 @@ Transform::operator=(const Transform& copy)
839839
return *this;
840840
}
841841

842+
std::vector<Vector> Transform::get_column_vectors() const
843+
{
844+
std::vector<Vector> column_vectors(3);
845+
for(int i = 0; i < 3; i++)
846+
{
847+
column_vectors[i] = Vector(mat[0][i], mat[1][i], mat[2][i]);
848+
}
849+
return column_vectors;
850+
}
851+
842852
Point
843-
SCIRun::Core::Geometry::operator*(Transform &t, const Point &d)
853+
SCIRun::Core::Geometry::operator*(const Transform &t, const Point &d)
844854
{
845855
double result[4], tmp[4];
846856
result[0] = result[1] = result[2] = result[3] = 0;
@@ -864,7 +874,7 @@ SCIRun::Core::Geometry::operator*(Transform &t, const Point &d)
864874
}
865875

866876
Vector
867-
SCIRun::Core::Geometry::operator*(Transform &t, const Vector &d)
877+
SCIRun::Core::Geometry::operator*(const Transform &t, const Vector &d)
868878
{
869879
double result[4], tmp[4];
870880
result[0] = result[1] = result[2] = result[3] = 0;

‎src/Core/GeometryPrimitives/Transform.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#ifndef CORE_GEOMETRY_TRANSFORM_H
3636
#define CORE_GEOMETRY_TRANSFORM_H 1
3737

38+
#include <vector>
3839
#include <Core/Persistent/Persistent.h>
3940

4041
#include <Core/GeometryPrimitives/share.h>
@@ -147,12 +148,13 @@ namespace SCIRun {
147148
/// Persistent I/O.
148149
static PersistentTypeID type_id;
149150
virtual void io(Piostream &stream);
151+
std::vector<Vector> get_column_vectors() const;
150152
};
151153

152-
SCISHARE Point operator*(Transform &t, const Point &d);
153-
SCISHARE Vector operator*(Transform &t, const Vector &d);
154+
SCISHARE Point operator*(const Transform &t, const Point &d);
155+
SCISHARE Vector operator*(const Transform &t, const Vector &d);
154156

155-
SCISHARE Tensor operator*(const Transform &t, const Tensor &d);
157+
SCISHARE Tensor operator*(const Transform &t, const Tensor &d);
156158
SCISHARE Tensor operator*(const Tensor &d, const Transform &t);
157159

158160
SCISHARE bool operator==(const Transform& lhs, const Transform& rhs);

0 commit comments

Comments
 (0)