From ff738998e38c347eb92a90d939c24b76ab09a5d7 Mon Sep 17 00:00:00 2001 From: Vaclav Mares <maresva2@fit.cvut.cz> Date: Fri, 31 Mar 2017 16:57:34 +0200 Subject: [PATCH] Generating automaton in inputDialog - connection to ALIB - changes in inputDialog --- agui2/ALIB.pro | 3 +++ agui2/inputdialog.cpp | 7 +------ agui2/inputdialog.h | 2 -- agui2/inputdialog.ui | 9 +++++---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/agui2/ALIB.pro b/agui2/ALIB.pro index c3dd3d33ea..dbce2cd1b5 100644 --- a/agui2/ALIB.pro +++ b/agui2/ALIB.pro @@ -79,6 +79,9 @@ else:unix: LIBS += -L$$PWD/$${ALIB_PATH}/bin-debug/ -lalib2data INCLUDEPATH += $$PWD/$${ALIB_PATH}/bin-debug DEPENDPATH += $$PWD/$${ALIB_PATH}/bin-debug +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/$${ALIB_PATH}/bin-debug/release/ -lalib2algo +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/$${ALIB_PATH}/bin-debug/debug/ -lalib2algo +else:unix: LIBS += -L$$PWD/$${ALIB_PATH}/bin-debug/ -lalib2algo INCLUDEPATH += $$PWD/$${ALIB_PATH}/alib2common/src/ INCLUDEPATH += $$PWD/$${ALIB_PATH}/alib2str/src/ diff --git a/agui2/inputdialog.cpp b/agui2/inputdialog.cpp index 9d15a02cde..fd340f6dda 100644 --- a/agui2/inputdialog.cpp +++ b/agui2/inputdialog.cpp @@ -2,7 +2,6 @@ #include "ui_inputdialog.h" #include <factory/XmlDataFactory.hpp> -#include <automaton/Automaton.h> #include <automaton/generate/RandomAutomatonFactory.h> InputDialog::InputDialog(QWidget *parent) : @@ -17,12 +16,8 @@ InputDialog::~InputDialog() delete ui; } -void InputDialog::on_plainTextEdit_5_textChanged() -{ - -} - void InputDialog::on_pushButton_clicked() { automaton::NFA < > res = automaton::generate::RandomAutomatonFactory::generateNFA ( 5, 3, false, 10.0 ); + ui->plainTextEdit_5->document()->setPlainText( QString::fromStdString(alib::XmlDataFactory::toString( res ) ) ); } diff --git a/agui2/inputdialog.h b/agui2/inputdialog.h index 1d13bed7a8..a6e529888e 100644 --- a/agui2/inputdialog.h +++ b/agui2/inputdialog.h @@ -16,8 +16,6 @@ public: ~InputDialog(); private slots: - void on_plainTextEdit_5_textChanged(); - void on_pushButton_clicked(); private: diff --git a/agui2/inputdialog.ui b/agui2/inputdialog.ui index 80cbe0ca42..1c6a52fcbc 100644 --- a/agui2/inputdialog.ui +++ b/agui2/inputdialog.ui @@ -19,7 +19,7 @@ <item> <widget class="QLineEdit" name="lineEdit_5"> <property name="text"> - <string>/home/venca/automata/NFA1.xml</string> + <string/> </property> </widget> </item> @@ -48,9 +48,7 @@ </sizepolicy> </property> <property name="plainText"> - <string><?xml version="1.0"?> -<NFA><states><Integer ref="0">0</Integer><Integer ref="1">1</Integer><Integer ref="2">2</Integer><Integer ref="3">3</Integer><Integer ref="4">4</Integer></states><inputAlphabet><Character ref="5">a</Character><Character ref="6">b</Character><Character ref="7">c</Character></inputAlphabet><initialState><Integer ref="8">0</Integer></initialState><finalStates><Ref id="2"/><Ref id="3"/></finalStates><transitions><transition><from><Ref id="0"/></from><input><Ref id="6"/></input><to><Ref id="1"/></to></transition><transition><from><Ref id="1"/></from><input><Ref id="5"/></input><to><Ref id="4"/></to></transition><transition><from><Ref id="1"/></from><input><Ref id="6"/></input><to><Ref id="0"/></to></transition><transition><from><Ref id="1"/></from><input><Ref id="7"/></input><to><Ref id="1"/></to></transition><transition><from><Ref id="2"/></from><input><Ref id="5"/></input><to><Ref id="2"/></to></transition><transition><from><Ref id="3"/></from><input><Ref id="5"/></input><to><Ref id="2"/></to></transition><transition><from><Ref id="4"/></from><input><Ref id="6"/></input><to><Ref id="2"/></to></transition><transition><from><Ref id="4"/></from><input><Ref id="6"/></input><to><Ref id="3"/></to></transition></transitions></NFA> -</string> + <string/> </property> </widget> </item> @@ -68,6 +66,9 @@ <property name="text"> <string>XML</string> </property> + <property name="checked"> + <bool>true</bool> + </property> </widget> </item> </layout> -- GitLab