Read about our upcoming Code of Conduct on this issue

Commit ad04820e authored by Aleksandr Bakhshiev's avatar Aleksandr Bakhshiev
Browse files

Partially fixed build bugs under windows-qt and c++ builder.

Some ugly solutions!!!

--HG--
branch : MockCompsTest
parent 7b5c06c78a01
......@@ -226,6 +226,9 @@
<CppCompile Include="..\..\..\Core\Engine\UAModel.cpp">
<BuildOrder>62</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Core\Engine\UBasePropCreator.cpp">
<BuildOrder>125</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Core\Engine\UBinaryEnvSerialize.cpp">
<DependentOn>..\..\..\Core\Engine\UBinaryEnvSerialize.h</DependentOn>
<BuildOrder>63</BuildOrder>
......@@ -296,6 +299,9 @@
<DependentOn>..\..\..\Core\Engine\ULoggerEnv.h</DependentOn>
<BuildOrder>119</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Core\Engine\UMockUNet.cpp">
<BuildOrder>126</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Core\Engine\UModule.cpp">
<BuildOrder>80</BuildOrder>
</CppCompile>
......@@ -1005,13 +1011,13 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
</Deployment>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
......
......@@ -300,5 +300,6 @@ unix {
windows {
DESTDIR = $$PWD/../../../../Bin/Platform/Win/Lib.Qt
QMAKE_CXXFLAGS += /bigobj
}
......@@ -227,7 +227,7 @@ void UProjectDeployProcessingThread::run()
std::string UProjectDeployProcessingThread::GetLastError()
{
return std::string("");
}
bool UProjectDeployProcessingThread::DownloadZip(const QString &remote_url, const QString& dst_zip_file)
......@@ -612,7 +612,7 @@ void UProjectDeployProcessingThread::DeployScript()
bool UProjectDeployProcessingThread::VerifyScript()
{
return true; // TODO:
}
void UProjectDeployProcessingThread::DeployWeights()
......@@ -745,7 +745,7 @@ void UProjectDeployProcessingThread::DeployData()
bool UProjectDeployProcessingThread::VerifyData()
{
return true; // TODO:
}
// --------------------------
......
......@@ -9,7 +9,9 @@
#include <QMutex>
#include <thread>
#include <mutex>
#ifdef __unix__
#include <curl/curl.h>
#endif
struct FtpFile {
const char *filename;
......
......@@ -181,7 +181,7 @@ void UServerTransportTcpQt::ServerNewConnection()
connect(sqt, SIGNAL(onDisconnected(std::string)), this, SLOT(SocketDisconnected(std::string)));
serverSockets[bnd] = sqt;
Application->GetServerControl()->GetServerTransport()->ConnectClient(bnd);
Application->GetServerControl()->GetServerTransport()->ClientConnect(bnd);
//Application->GetServerControl()->ProcessIncomingData(bnd, Application->GetServerControl()->GetServerTransport());
}
}
......@@ -194,7 +194,7 @@ void UServerTransportTcpQt::SocketReadyRead(std::string bind)
void UServerTransportTcpQt::SocketDisconnected(std::string bind)
{
Application->GetServerControl()->GetServerTransport()->DisconnectClient(bind);
Application->GetServerControl()->GetServerTransport()->ClientDisconnect(bind);
//
std::map<std::string, UServerSocketQt*>::iterator I = serverSockets.find(bind);
if(I!=serverSockets.end())
......
......@@ -51,7 +51,7 @@ void UProjectDeployer::SetDatabaseAccess(const std::string &db_address,
int UProjectDeployer::GetDeploymentState()
{
return 0;
}
int UProjectDeployer::GetStageCap()
......
#include "UBasePropCreator.h"
#include "UComponent.h"
#include "../Utilities/USupport.h"
std::vector<std::string> ForbiddenInputs = {"DataInput0", "DataInput1", "DataInput2","DataInput3" , "DataInput4", "DataInput5"};
std::vector<std::string> ForbiddenOutputs = {"DataOutput0", "DataOutput1", "DataOutput2", "DataOutput3", "DataOutput4", "DataOutput5"};
std::vector<std::string> ForbiddenInputs;
std::vector<std::string> ForbiddenOutputs;
using namespace RDK;
UBasePropCreator::UBasePropCreator()
{
if(ForbiddenInputs.empty())
{
ForbiddenInputs.push_back("DataInput0");
ForbiddenInputs.push_back("DataInput1");
ForbiddenInputs.push_back("DataInput2");
ForbiddenInputs.push_back("DataInput3");
ForbiddenInputs.push_back("DataInput4");
ForbiddenInputs.push_back("DataInput5");
}
if(ForbiddenOutputs.empty())
{
ForbiddenOutputs.push_back("DataOutput0");
ForbiddenOutputs.push_back("DataOutput1");
ForbiddenOutputs.push_back("DataOutput2");
ForbiddenOutputs.push_back("DataOutput3");
ForbiddenOutputs.push_back("DataOutput4");
ForbiddenOutputs.push_back("DataOutput5");
}
}
bool UBasePropCreator::BaseCrPropMock(RDK::USerStorageXML* serstorage, RDK::UMockUNet* mock_unet)
......@@ -195,14 +214,14 @@ void UBasePropCreator::CreateProperty(RDK::USerStorageXML* serstorage, RDK::UMoc
// MVector
if(type.find("MVector",0) == 0)
{
CreatorProperty<PropType, TypeInt, MVector<UnKnow,0> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
// MMatrix
if(type.find("MMatrix",0) == 0)
{
CreatorProperty<PropType, TypeInt, MMatrix<UnKnow,0,0> >::CreatePropertyByType(serstorage,mock_unet);
CreatorProperty<PropType, TypeInt, MVector<UnKnow,1> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
// MMatrix
if(type.find("MMatrix",0) == 0)
{
CreatorProperty<PropType, TypeInt, MMatrix<UnKnow,1,1> >::CreatePropertyByType(serstorage,mock_unet);
return;
}
}
......@@ -1047,7 +1066,7 @@ public:
// MMatrix [rows,cols] - [3,3][4,4] - double, int, bool
template <template<typename, typename, unsigned int> class PropType, unsigned int TypeInt>
class CreatorProperty<PropType, TypeInt, MMatrix<UnKnow,0,0> >
class CreatorProperty<PropType, TypeInt, MMatrix<UnKnow,1,1> >
{
public:
static bool CreatePropertyByType(RDK::USerStorageXML* serstorage, UMockUNet* mock_unet)
......@@ -1103,7 +1122,7 @@ public:
}
if( (rows == 4) && (cols == 4))
{
CreatorProperty<PropType, TypeInt, MMatrix<double,4,4> >::CreatePropertyByType(serstorage, mock_unet);
CreatorProperty<PropType, TypeInt, MMatrix<double,4,4> >::CreatePropertyByType(serstorage, mock_unet);
return true;
}
}
......
......@@ -24,20 +24,4 @@ public:
};
// ,
class UnKnow
{
private:
UnKnow() {}
};
// ""
class simpleVector
{
private:
simpleVector() {}
};
#endif // UBASEPROPCREATOR_H
......@@ -765,4 +765,5 @@ const ULinkT<T>& ULinksListT<T>::operator [] (int index) const
}
#endif
......@@ -681,7 +681,7 @@ bool UMockLibrary::SaveLibraryToFile()
CurrentComponentStruct.SetNodeAttribute("Name", Name);
CurrentComponentStruct.SetNodeAttribute("Version", Version);
CurrentComponentStruct.SetNodeAttribute("Revision", std::to_string(Revision));
CurrentComponentStruct.SetNodeAttribute("Revision", sntoa(Revision));
CurrentComponentStruct.SetNodeAttribute("CoreVersion",GetGlobalVersion().ToStringFull());
// XML
......
......@@ -1447,7 +1447,7 @@ bool UStorage::SaveMockLibs(void)
LibList.AddNode("library");
LibList.SetNodeAttribute("Version",lib->GetVersion());
LibList.SetNodeAttribute("Revision",std::to_string(lib->GetRevision()));
LibList.SetNodeAttribute("Revision",sntoa(lib->GetRevision()));
LibList.SetNodeAttribute("CoreVersion",GetGlobalVersion().ToStringFull());
LibList.SetNodeText(lib->GetName());
LibList.SelectUp();
......@@ -1456,6 +1456,7 @@ bool UStorage::SaveMockLibs(void)
std::string file_name = "../../../MockLibs/0_LibList.xml";
LibList.SaveToFile(file_name);
return true;
}
//
......
......@@ -157,6 +157,20 @@ USerStorageXML& operator >> (USerStorageXML& storage, long double &data)
return USimpleFromStorageF(storage,data);
}
USerStorageXML& operator << (USerStorageXML& storage, const UnKnow &data)
{
storage.SetNodeAttribute("Type",std::string("UnKnow"));
return storage;
}
USerStorageXML& operator >> (USerStorageXML& storage, UnKnow &data)
{
return storage;
}
//
USerStorageXML& operator << (USerStorageXML& storage, const std::vector<bool> &data)
{
......
......@@ -169,6 +169,9 @@ USerStorageXML& operator >> (USerStorageXML& storage, T* &data)
return storage;
}
USerStorageXML& operator << (USerStorageXML& storage, const UnKnow &data);
USerStorageXML& operator >> (USerStorageXML& storage, UnKnow &data);
//
template<typename T1, typename T2>
USerStorageXML& operator << (USerStorageXML& storage, const std::pair<T1,T2> &data)
......
......@@ -84,6 +84,22 @@ See file license.txt for more information
#define ISNAN(x) ((x) != (x))
#endif
// ,
class UnKnow
{
private:
public:
UnKnow() {}
};
// ""
class simpleVector
{
private:
public:
simpleVector() {}
};
namespace RDK {
......
......@@ -2,7 +2,9 @@
#define UCurlFtpClientTestWidget_H
#include "UVisualControllerWidget.h"
#ifdef __unix__
#include <curl/curl.h>
#endif
#include <QProcess>
namespace Ui {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment