Merge pull request #7 from dyollb/macos_build

fix several issues in mac os build

Author: dyollb

Core/HDF5IO.cpp

@@ -50,6 +50,7 @@ HDF5IO::handle_id_type HDF5IO::open(const std::string& fname)
 
 HDF5IO::handle_id_type HDF5IO::create(const std::string& fname, bool append)
 {
+	static_assert(std::is_same<HDF5IO::handle_id_type, hid_t>::value, "hid_t mismatch. this will lead to runtime errors.");
 	if (append && !existsValidHdf5(fname.c_str()))
 	{
 		append = false;

Core/HDF5IO.h

@@ -11,6 +11,8 @@
 
 #include "iSegCore.h"
 
+#include <hdf5.h>
+
 #include <cstdint>
 #include <string>
 
@@ -19,7 +21,7 @@ namespace iseg {
 class iSegCore_API HDF5IO
 {
 public:
-	typedef long handle_id_type;
+	typedef hid_t handle_id_type;
 
 	int chunk_size = 0;
 

Core/HDF5IO.inl

@@ -1,7 +1,5 @@
 #include "HDF5IO.h"
 
-#include <hdf5.h>
-
 namespace iseg {
 
 template<typename T>
@@ -155,8 +153,7 @@ bool HDF5IO::writeData(handle_id_type file, const std::string& name,
 		datatype = H5Tcopy(getTypeValue<T>());
 		status = H5Tset_order(datatype, H5T_ORDER_LE);
 
-		dataset =
-			H5Dcreate(file, name.c_str(), datatype, dataspace, properties);
+		dataset = H5Dcreate(file, name.c_str(), datatype, dataspace, properties);
 	}
 	else // open existing
 	{

Core/HDF5Reader.h

@@ -22,7 +22,7 @@ class iSegCore_API HDF5Reader
 {
 public:
 	typedef unsigned long long size_type;
-	typedef int hid_type;
+	typedef long long hid_type;
 	HDF5Reader();
 	~HDF5Reader();
 	int open(const std::string&);

Core/HDF5Writer.h

@@ -21,7 +21,7 @@ class iSegCore_API HDF5Writer
 {
 public:
 	typedef unsigned long long size_type;
-	typedef int hid_type;
+	typedef long long hid_type;
 	HDF5Writer();
 	~HDF5Writer();
 

iSeg/CMakeLists.txt

@@ -142,6 +142,9 @@ IF(WIN32)
 ELSE()
 	IF(APPLE)
 		FILE(GLOB ICON_FILES images/*.png images/*.ico)
+		SET_SOURCE_FILES_PROPERTIES(${ICON_FILES}
+			PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/images		
+		)
 	ENDIF()
 ENDIF()
 

iSeg/XdmfImageWriter.cpp

@@ -324,21 +324,21 @@ int XdmfImageWriter::InternalWrite(const char* filename, float** slicesbmp,
 		dimension[1] = dims[1];
 		dimension[2] = dims[2];
 		dim1[0] = 3;
-		if (!writer.write(dimension, dim1, std::string("/dimensions")))
+		if (!writer.write(dimension, dim1, std::string("dimensions")))
 		{
 			cerr << "error writing dimensions" << endl;
 		}
-		if (!writer.write(offset, dim1, std::string("/offset")))
+		if (!writer.write(offset, dim1, std::string("offset")))
 		{
 			cerr << "error writing offset" << endl;
 		}
-		if (!writer.write(pixelsize, dim1, std::string("/pixelsize")))
+		if (!writer.write(pixelsize, dim1, std::string("pixelsize")))
 		{
 			cerr << "error writing pixelsize" << endl;
 		}
 		dim1[0] = 6;
 
-		if (!writer.write(dc, dim1, std::string("/dc")))
+		if (!writer.write(dc, dim1, std::string("dc")))
 		{
 			cerr << "error writing dc" << endl;
 		}
@@ -351,7 +351,7 @@ int XdmfImageWriter::InternalWrite(const char* filename, float** slicesbmp,
 			rotation[k * 3 + 2] = ImageTransform[k][2];
 		}
 		dim1[0] = 9;
-		if (!writer.write(rotation, dim1, std::string("/rotation")))
+		if (!writer.write(rotation, dim1, std::string("rotation")))
 		{
 			cerr << "error writing rotation" << endl;
 		}

iSeg/main.cpp

@@ -185,20 +185,26 @@ int main(int argc, char** argv)
 	{
 		QString qstr(argv[1]);
 		if (qstr.compare(QString("S4Llink")) == 0)
+		{
 			mainWindow = new MainWindow(
 				&h3Ds2, QString(locationpath.toAscii().data()), picpath, tmpdir,
 				true, 0, "new window",
 				Qt::WDestructiveClose | Qt::WResizeNoErase, argv);
+		}
 	}
 	if (mainWindow == NULL)
+	{
 		mainWindow =
 			new MainWindow(&h3Ds2, QString(locationpath.toAscii().data()),
 						   picpath, tmpdir, false, 0, "new window",
 						   Qt::WDestructiveClose | Qt::WResizeNoErase, argv);
+	}
 
 	QFile qss(stylesheetpath.toAscii().data());
 	qss.open(QFile::ReadOnly);
-	mainWindow->setStyleSheet(qss.readAll());
+	//mainWindow->setStyleSheet(qss.readAll());
+	cerr << qss.fileName().toStdString() << endl;
+	mainWindow->setStyleSheet("color: white;");
 	qss.close();
 	//mainWindow->setStyleSheet("QDockWidget { color: black; } QDockWidget::title { background: lightgray; padding-left: 5px; padding-top: 3px;  } QDockWidget::close-button, QDockWidget::float-button { background: lightgray; } QMenuBar { background-color: gray; } QMenu::separator { background-color: lightgrey; height: 1px; margin-left: 10px; margin-right: 10px; } QMenu::item:disabled { color: darkgrey; }" );