huanld/speckle-cpp-connectors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logging working cross-platform

Browse Source
This commit is contained in:
Ralph Wessel
2024-08-28 23:22:44 +01:00
parent 4202e9f92c
commit c218da359f
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpeckleLib/Speckle/Interface/Browser/JSPortal.h
+8 -1
View File
@@ -9,6 +9,8 @@
#include <JavascriptEngine.hpp>
#endif
#include <iostream>
namespace speckle::interfac::browser {
/*!
@@ -71,7 +73,12 @@ namespace speckle::interfac::browser {
try {
auto engine = getJSEngine();
OutputDebugString((LPCTSTR)speckle::utility::String{ "\nExecuted:\n" + code}.operator std::u16string().data());
speckle::utility::String log{"\nExecuted:\n" + code};
#ifdef macintosh
std::cout << log.data();
#else
OutputDebugString((LPCTSTR)log.operator std::u16string().data());
#endif
auto result = engine ? engine->ExecuteJS(code) : false;
return result;
SpeckleLib/Speckle/Serialise/JSBase/JSBaseTransport.cpp
+18 -2
View File
@@ -15,6 +15,8 @@
#include <JSON/JDOMWriter.hpp>
#include <JSON/Value.hpp>
#include <iostream>
using namespace active::serialise;
using namespace active::setting;
using namespace speckle::serialise;
@@ -464,7 +466,14 @@ namespace {
--------------------------------------------------------------------*/
void JSBaseTransport::send(Cargo&& cargo, const Identity& identity, GS::Ref<JS::Base>& destination) const {
doJSBaseExport(cargo, JSBaseIdentity(identity).atStage(root), destination);
OutputDebugString((WCHAR*)String {"\nSent:\n" + convertToJSON(destination)}.operator std::u16string().data());
speckle::utility::String log{"\nSent:\n" + convertToJSON(destination)};
#ifdef macintosh
std::cout << log.data();
#else
OutputDebugString((LPCTSTR)log.operator std::u16string().data());
#endif
} //JSBaseTransport::send
@@ -478,7 +487,14 @@ void JSBaseTransport::send(Cargo&& cargo, const Identity& identity, GS::Ref<JS::
void JSBaseTransport::receive(Cargo&& cargo, const Identity& identity, GS::Ref<JS::Base> source) const {
if (!source)
throw std::system_error(makeJSBaseError(badSource));
OutputDebugString((WCHAR*) String{"\nReceived:\n" + convertToJSON(source)}.operator std::u16string().data());
speckle::utility::String log{"\nReceived:\n" + convertToJSON(source)};
#ifdef macintosh
std::cout << log.data();
#else
OutputDebugString((LPCTSTR)log.operator std::u16string().data());
#endif
doJSBaseImport(cargo, JSBaseIdentity(identity).atStage(root), *source);
} //JSBaseTransport::receive