Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read matlab mat files using matio library #18

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions include/MatioModel.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2012, Willow Garage, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of Willow Garage, Inc. nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* File: MatlabIOModel.hpp
* Author: Tim Sheerman-Chase
* Created: Apr 1, 2013
*/

#ifndef MATIOMODEL_HPP_
#define MATIOMODEL_HPP_

#include "Model.hpp"
#include "types.hpp"

/*! @class MatlabIOModel
* @brief Model implementation with Matlab .Mat file deserialization
*/
class MatioModel: public Model
{
public:
MatioModel() {}
virtual ~MatioModel() {}
bool deserialize(const std::string& filename);
bool serialize(const std::string& filename) const;

protected:
bool readModelData(struct mat_t *matfp, struct matvar_t *model);
};

#endif /* MATIOMODEL_HPP_ */
2 changes: 1 addition & 1 deletion matlab/modelTransfer.m
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,4 @@
end
model.components{i} = parts;
end
end
end
11 changes: 11 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ if (cvmatio_FOUND)
)
endif()

if (1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_MATIO")
set(SRC_FILES ${SRC_FILES} MatioModel.cpp)
set(LIBS ${LIBS} ${ZLIB_LIBRARIES} "-lmatio")
add_executable(ModelTransfer ModelTransfer.cpp FileStorageModel.cpp MatioModel.cpp)
target_link_libraries(ModelTransfer ${LIBS})
install(TARGETS ModelTransfer
RUNTIME DESTINATION ${PROJECT_SOURCE_DIR}/bin
)
endif()

# as a library (always)
add_library(${PROJECT_NAME}_lib SHARED ${SRC_FILES})
target_link_libraries(${PROJECT_NAME}_lib ${LIBS})
Expand Down
1 change: 0 additions & 1 deletion src/FileStorageModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
*/

#include <sstream>
#include <iostream>
#include <opencv2/core/core.hpp>
#include "FileStorageModel.hpp"

Expand Down
Loading