nasicurious
/
CommandDetector
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add ui and clean code

cleanAndupdate1
nasiCurious 2 years ago
parent
685a697489
commit
72c8009971
11 changed files with 339 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 4
      CommandDetector.pro
  3. 77
      CommandDetector.pro.user
  4. 13
      logic/include/CommandDecoder.h
  5. 27
      logic/include/CommandsType.h
  6. 81
      logic/src/CommandDecoder.cpp
  7. 7
      test/include/CommandDecoderTest.h
  8. 129
      test/src/CommandDecoderTest.cpp
  9. 8
      test/src/main.cpp
  10. 37
      ui/main.cpp
  11. 31
      ui/ui.pro

2
.gitignore
View File

@ -0,0 +1,2 @@
*.pro.user

4
CommandDetector.pro
View File

@ -2,6 +2,8 @@ TEMPLATE = subdirs
SUBDIRS += \ SUBDIRS += \
logic \ logic \
test test \
ui
test.depends += logic test.depends += logic
ui.depends += logic

77
CommandDetector.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.10.0, 2022-10-11T09:57:58. --> <!-- Written by QtCreator 4.10.0, 2022-10-29T16:44:05. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -65,9 +65,9 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.13.1 GCC 64bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.13.1 GCC 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.13.1 GCC 64bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.13.1 GCC 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5131.gcc_64_kit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5131.gcc_64_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@ -315,9 +315,76 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Release/test</value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug/test</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
<value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
<valuelist type="QVariantList" key="Analyzer.Perf.Events">
<value type="QString">cpu-cycles</value>
</valuelist>
<valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
<value type="int" key="Analyzer.Perf.Frequency">250</value>
<value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Perf.StackSize">4096</value>
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">ui</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/CommandDetector/ui/ui.pro</value>
<value type="QString" key="RunConfiguration.Arguments">-node 22 -f -g 33</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">false</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseTerminal">false</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/hasis/Desktop/Nastaran/TRAIN/TaskLearning2/build-CommandDetector-Desktop_Qt_5_13_1_GCC_64bit-Debug/ui</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>

13
logic/include/CommandDecoder.h
View File

@ -7,12 +7,21 @@
class CommandDecoder class CommandDecoder
{ {
private: private:
bool isStartWithDash(char* argv); QList<CommandsType> decodedList;
bool isNextItemValue = true;
int j = 0;
int _argc;
bool isCommand(char* argv);
void checkIfEnoughArgsAreProvided(int argc);
QList<CommandsType> CommandValueDecoder(char* argv[]);
void initCommandStrcut(char* argv, CommandsType& sample);
void checkIfNextItemShallBeValue(char* argv);
public: public:
CommandDecoder(); CommandDecoder();
QList<CommandsType2> decodeStrintg(int argc, char* argv[]); QList<CommandsType> decoderString(int argc, char* argv[]);
}; };
#endif //COMMANDDECODER_H #endif //COMMANDDECODER_H

27
logic/include/CommandsType.h
View File

@ -6,32 +6,43 @@
#include <QMetaType> #include <QMetaType>
struct CommandsType2 struct CommandsType
{ {
char* command; char* command;
char* value; char* value;
bool operator==(const CommandsType2& com) const bool operator==(const CommandsType& rhs) const
{ {
for(size_t i = 0; i < strlen(com.command); i++) for(size_t i = 0; i < strlen(rhs.command); i++)
{ {
if(com.command[i] != command[i]) if(rhs.command[i] != command[i])
{ {
return false; return false;
} }
} }
for(size_t i = 0; i < strlen(com.value); i++) if(value != Q_NULLPTR && rhs.value != Q_NULLPTR)
{ {
if(com.value[i] != value[i]) for(size_t i = 0; i < strlen(rhs.value); i++)
{ {
return false; if(rhs.value[i] != value[i])
{
return false;
}
} }
} }
else if(value == Q_NULLPTR && rhs.value == Q_NULLPTR)
{
return true;
}
else
{
return false;
}
return true; return true;
} }
}; };
Q_DECLARE_METATYPE(CommandsType2); Q_DECLARE_METATYPE(CommandsType);
#endif //COMMANDSTYPE_H #endif //COMMANDSTYPE_H

81
logic/src/CommandDecoder.cpp
View File

@ -1,55 +1,70 @@
#include "../include/CommandDecoder.h" #include "../include/CommandDecoder.h"
QList<CommandsType2> CommandDecoder::decodeStrintg(int argc, char* argv[]) QList<CommandsType> CommandDecoder::decoderString(int argc, char* argv[])
{
_argc = argc;
checkIfEnoughArgsAreProvided(_argc);
return CommandValueDecoder(argv);
}
//****************************************************************
bool CommandDecoder::isCommand(char* argv)
{
return ('-' == argv[0]);
}
//****************************************************************
void CommandDecoder::checkIfEnoughArgsAreProvided(int argc)
{ {
if(argc < 2) if(argc < 2)
{ {
throw" the usage should lookLike this Sin <parameter>"; throw"the usage should lookLike this Sin <parameter>";
} }
else }
{
QList<CommandsType2> test;
bool checkIsValue;
auto count = argc - 1;
uint8_t j = 1;
checkIsValue = false;
while(j <= count) //****************************************************************
QList<CommandsType> CommandDecoder::CommandValueDecoder(char* argv[])
{
while(j < _argc)
{
CommandsType sample;
if(isCommand(argv[j]))
{
initCommandStrcut(argv[j], sample);
}
else
{ {
auto sample1 = new CommandsType2(); checkIfNextItemShallBeValue(argv[j]);
if(isStartWithDash(argv[j]))
{
sample1->command = argv[j];
checkIsValue = true;
test.append(*sample1);
}
else
{
if(!checkIsValue)
{
throw" error hasValue ";
}
test.last().value = argv[j];
checkIsValue = false;
}
j++;
} }
return test; j++;
} }
return decodedList;
} }
bool CommandDecoder::isStartWithDash(char* argv) //****************************************************************
void CommandDecoder::checkIfNextItemShallBeValue(char* argv)
{ {
if('-' == argv[0]) if(!isNextItemValue)
{ {
return true; throw"duplicated Value and its wrong";
} }
decodedList.last().value = argv;
isNextItemValue = false;
}
return false; //****************************************************************
void CommandDecoder::initCommandStrcut(char* argv, CommandsType& sample)
{
sample.command = argv;
sample.value = Q_NULLPTR;
isNextItemValue = true;
decodedList.append(sample);
} }
//****************************************************************
CommandDecoder::CommandDecoder() CommandDecoder::CommandDecoder()
{ {
} }

7
test/include/CommandDecoderTest.h
View File

@ -10,7 +10,8 @@ class CommandDecoderTest : public QObject
Q_OBJECT Q_OBJECT
private: private:
QList<CommandsType2> handiResult(); QList<CommandsType> create2CommandSample();
QList<CommandsType> createCorrectOrderOfCommand();
public: public:
CommandDecoderTest(); CommandDecoderTest();
@ -19,7 +20,9 @@ public:
//uncrustify off //uncrustify off
private slots: private slots:
//uncrustify on //uncrustify on
void testDecoder(); void normalOrderTestCase();
void twoCommandOrderTestCase();
void morethanOneValueTestCase();
}; };
#endif //COMMANDDECODERTEST_H #endif //COMMANDDECODERTEST_H

129
test/src/CommandDecoderTest.cpp
View File

@ -1,18 +1,44 @@
#include "include/CommandDecoderTest.h" #include "include/CommandDecoderTest.h"
#include "CommandDecoder.h" #include "CommandDecoder.h"
QList<CommandsType2> CommandDecoderTest::handiResult() QList<CommandsType> CommandDecoderTest::create2CommandSample()
{ {
QList<CommandsType2> blist; //-node 3 -g -f 11 -o filetext.txt
auto b1 = new CommandsType2(); QList<CommandsType> blist;
auto b2 = new CommandsType2(); CommandsType b1;
b1->command = "-node"; CommandsType b2;
b1->value = "3"; CommandsType b3;
blist.append(*b1); CommandsType b4;
b2->command = "-f"; b1.command = "-node";
b2->value = "7"; b1.value = "3";
blist.append(*b2); blist.append(b1);
b2.command = "-g";
b2.value = Q_NULLPTR;
blist.append(b2);
b3.command = "-f";
b3.value = "11";
blist.append(b3);
b4.command = "-o";
b4.value = "filetext.txt";
blist.append(b4);
return blist;
}
//****************************************************************
QList<CommandsType> CommandDecoderTest::createCorrectOrderOfCommand()
{
//-node 3 -f 7
QList<CommandsType> blist;
CommandsType b1;
CommandsType b2;
b1.command = "-node";
b1.value = "3";
blist.append(b1);
b2.command = "-f";
b2.value = "7";
blist.append(b2);
return blist; return blist;
} }
@ -28,27 +54,80 @@ CommandDecoderTest::~CommandDecoderTest()
} }
//**************************************************************** //****************************************************************
void CommandDecoderTest::testDecoder() void CommandDecoderTest::normalOrderTestCase()
{ {
CommandDecoder comTest; CommandDecoder temp;
char* ptr_array[5]; char* ptr_array[4];
char array[5][20] = {{0}};
strcpy(array[0], "order"); char array[4][20] = {{0}};
strcpy(array[1], "-node"); strcpy(array[0], "-node");
strcpy(array[2], "3"); strcpy(array[1], "3");
strcpy(array[3], "-f"); strcpy(array[2], "-f");
strcpy(array[4], "7"); strcpy(array[3], "7");
for(int i = 0; i < 5; i++) for(int i = 0; i < 4; i++)
{ {
ptr_array[i] = array[i]; ptr_array[i] = array[i];
} }
QList<CommandsType2> c1 = comTest.decodeStrintg(5, ptr_array); QList<CommandsType> c1 = temp.decoderString(4, ptr_array);
auto c2 = handiResult(); auto c2 = createCorrectOrderOfCommand();
//QVERIFY(c1 == c2); QCOMPARE(c1, c2);
}
//****************************************************************
void CommandDecoderTest::twoCommandOrderTestCase()
{
//-node 3 -g -f 11 -o filetext.txt
CommandDecoder temp;
char* ptr_array[7];
char array[7][20] = {{0}};
strcpy(array[0], "-node");
strcpy(array[1], "3");
strcpy(array[2], "-g");
strcpy(array[3], "-f");
strcpy(array[4], "11");
strcpy(array[5], "-o");
strcpy(array[6], "filetext.txt");
for(int i = 0; i < 7; i++)
{
ptr_array[i] = array[i];
}
QList<CommandsType> c1 = temp.decoderString(7, ptr_array);
auto c2 = create2CommandSample();
QCOMPARE(c1, c2); QCOMPARE(c1, c2);
//QCOMPARE(c, c1); }
//****************************************************************
void CommandDecoderTest::morethanOneValueTestCase()
{
//-node 3 -g 15 16 -h 22
CommandDecoder temp;
char* ptr_array[7];
char array[7][20] = {{0}};
strcpy(array[0], "-node");
strcpy(array[1], "3");
strcpy(array[2], "-g");
strcpy(array[3], "15");
strcpy(array[4], "11");
strcpy(array[5], "-h");
strcpy(array[6], "22");
for(int i = 0; i < 7; i++)
{
ptr_array[i] = array[i];
}
try
{
QList<CommandsType> c1 = temp.decoderString(7, ptr_array);
QVERIFY(false);
}
catch(...)
{
QVERIFY(true);
}
} }

8
test/src/main.cpp
View File

@ -4,7 +4,13 @@
int main() int main()
{ {
QTest::qExec(new CommandDecoderTest); try {
QTest::qExec(new CommandDecoderTest);
}
catch(...)
{
qDebug() << "some error in test \n";
}
return 0; return 0;
} }

37
ui/main.cpp
View File

@ -0,0 +1,37 @@
#include <QCoreApplication>
#include <CommandDecoder.h>
#include <QDebug>
int main(int argc, char* argv[])
{
QCoreApplication a(argc, argv);
try {
CommandDecoder dr;
char* arrayCopy[argc - 1];
//delete 1 (index 0)
for(int i = 0; i < argc; ++i)
{
arrayCopy[i] = argv[i + 1]; //copy next element left
}
auto result = dr.decoderString(argc - 1, arrayCopy);
for(int i = 0; i < result.length(); i++)
{
qDebug() << "command: " << result[i].command << " --- Value: " << result[i].value <<
endl;
}
}
catch(char* excp)
{
qDebug() << "Caught some error in ui " << excp;
}
catch(...)
{
qDebug() << "some error in ui \n";
}
return a.exec();
}

31
ui/ui.pro
View File

@ -0,0 +1,31 @@
QT -= gui
CONFIG += c++11 console
CONFIG -= app_bundle
# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
# You can also make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
main.cpp
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
unix:!macx: LIBS += -L$$OUT_PWD/../logic/ -llogic
INCLUDEPATH += $$PWD/../logic/include
DEPENDPATH += $$PWD/../logic/include
unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../logic/liblogic.a
Write Preview
Loading…
Cancel
Save