Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Aron Helser
SMTK
Commits
0bf6295e
Commit
0bf6295e
authored
Dec 05, 2019
by
Ben Boeckel
Browse files
cJSON: remove mention of cJSON from the codebase
It is no longer necessary.
parent
04d90714
Changes
12
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
0bf6295e
...
...
@@ -660,7 +660,6 @@ include_directories(
SYSTEM
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/thirdparty"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/thirdparty"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/thirdparty/cJSON"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/thirdparty/pugixml"
"
${
Boost_INCLUDE_DIRS
}
"
)
...
...
LICENSE.txt
View file @
0bf6295e
...
...
@@ -33,7 +33,6 @@ contents of these for details on the specifics of their respective
licenses.
- - - - - - - - - - - - - - - - - - - - - - - -
Thirdparty/pugixml
Thirdparty/cJSON
Thirdparty/PyYaml
Thidpary/rtvl
CMake/FindDocutils.cmake
smtk/CMakeLists.txt
View file @
0bf6295e
...
...
@@ -79,7 +79,6 @@ if(WIN32)
set
(
moab_libs
"MOAB"
)
endif
()
set
(
smtkCore_public_link_libraries
cJSON
${
moab_libs
}
nlohmann_json
taocpp::pegtl
...
...
smtk/extension/qt/qtModelView.cxx
View file @
0bf6295e
...
...
@@ -365,13 +365,6 @@ bool qtModelView::requestOperation(const smtk::operation::OperationPtr& brOp, bo
m_OperationsDock
->
updateGeometry
();
}
return
true
;
// cJSON* json = cJSON_CreateObject();
// SaveJSON::forOperation(brOp, json);
// std::cout << "Found operator " << cJSON_Print(json) << ")\n";
// OperationResult result = brOp->operate();
// json = cJSON_CreateObject();
// SaveJSON::forOperationResult(result, json);
// std::cout << "Result " << cJSON_Print(json) << "\n";
// emit this->operationRequested(uid, action->text());
// emit this->operationFinished(result);
...
...
smtk/model/SessionIO.h
View file @
0bf6295e
...
...
@@ -42,10 +42,6 @@ namespace model
*
* Note that the I/O format being handled will dictate
* additional subclass methods to be implemented.
* For example, LoadJSON and SaveJSON will dynamically
* cast the returned shared pointer to a SessionIOJSON
* instance and (if it is non-null) call methods which
* accept cJSON pointers.
*/
class
SMTKCORE_EXPORT
SessionIO
{
...
...
smtk/model/SessionIOJSON.h
View file @
0bf6295e
...
...
@@ -18,8 +18,6 @@ SMTK_THIRDPARTY_PRE_INCLUDE
#include
"nlohmann/json.hpp"
SMTK_THIRDPARTY_POST_INCLUDE
struct
cJSON
;
namespace
smtk
{
namespace
model
...
...
smtk/model/testing/cxx/benchmarkModel.cxx
View file @
0bf6295e
...
...
@@ -11,8 +11,6 @@
#include
"smtk/model/json/jsonResource.h"
#include
"smtk/model/testing/cxx/helpers.h"
#include
"cJSON.h"
#include
<fstream>
#include
<iostream>
...
...
smtk/session/discrete/operators/ReadOperation.cxx
View file @
0bf6295e
...
...
@@ -34,7 +34,6 @@
// #define SMTK_DISCRETE_SESSION_DEBUG
#if defined(SMTK_DISCRETE_SESSION_DEBUG)
#include
"cJSON.h"
#include
"smtk/io/SaveJSON.h"
#endif
...
...
smtk/session/discrete/operators/WriteOperation.cxx
View file @
0bf6295e
...
...
@@ -31,7 +31,6 @@
// #define SMTK_DISCRETE_SESSION_DEBUG
#if defined(SMTK_DISCRETE_SESSION_DEBUG)
#include
"cJSON.h"
#include
"smtk/io/SaveJSON.h"
#endif
...
...
smtk/session/polygon/SessionIOJSON.h
View file @
0bf6295e
...
...
@@ -15,8 +15,6 @@
#include
"smtk/session/polygon/Exports.h"
#include
"smtk/session/polygon/Resource.h"
struct
cJSON
;
namespace
smtk
{
namespace
session
...
...
smtk/session/polygon/json/jsonModel.cxx
View file @
0bf6295e
...
...
@@ -32,7 +32,8 @@ void to_json(json& j, const smtk::session::polygon::internal::pmodel::Ptr& pmode
j
[
"j axis"
]
=
std
::
vector
<
double
>
(
pmodel
->
jAxis
(),
pmodel
->
jAxis
()
+
3
);
j
[
"feature size"
]
=
pmodel
->
featureSize
();
// Encode model scale carefully since cJSON cannot store large integers faithfully:
// Encode model scale carefully since some JSON implementations store numbers
// in doubles which loses precision with large integers.
std
::
vector
<
int
>
modelScaleBytes
(
8
);
long
long
mscale
=
static_cast
<
long
long
>
(
pmodel
->
modelScale
());
for
(
int
i
=
0
;
i
<
8
;
++
i
)
...
...
smtk/session/polygon/pybind11/PybindSessionIOJSON.h
View file @
0bf6295e
...
...
@@ -17,8 +17,6 @@
#include
"smtk/model/SessionIOJSON.h"
#include
"cJSON.h"
namespace
py
=
pybind11
;
py
::
class_
<
smtk
::
session
::
polygon
::
SessionIOJSON
,
smtk
::
model
::
SessionIOJSON
>
pybind11_init_smtk_session_polygon_SessionIOJSON
(
py
::
module
&
m
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment