[Olena-patches] e456b2c Try to add segmentation tasks.

--- XmlParser/XmlParser | Bin 1161618 -> 0 bytes XmlParser/XmlParser.pro | 9 +++++++-- XmlParser/XmlParser.pro.user | 36 ++++++++++++++++++------------------ XmlParser/mainwindow.cpp | 10 ++++++++-- XmlParser/mainwindow.h | 1 + XmlParser/mainwindow.ui | 16 +++++----------- XmlParser/runner.cpp | 6 ++++++ XmlParser/runner.h | 25 +++++++++++++++++++++++++ XmlParser/toolbar.cpp | 14 ++++++++++++++ XmlParser/toolbar.h | 17 +++++++++++++++++ 10 files changed, 101 insertions(+), 33 deletions(-) delete mode 100755 XmlParser/XmlParser create mode 100644 XmlParser/runner.cpp create mode 100644 XmlParser/runner.h create mode 100644 XmlParser/toolbar.cpp create mode 100644 XmlParser/toolbar.h diff --git a/XmlParser/XmlParser b/XmlParser/XmlParser deleted file mode 100755 index 083bcef..0000000 Binary files a/XmlParser/XmlParser and /dev/null differ diff --git a/XmlParser/XmlParser.pro b/XmlParser/XmlParser.pro index 1b9bca8..812902d 100644 --- a/XmlParser/XmlParser.pro +++ b/XmlParser/XmlParser.pro @@ -4,16 +4,21 @@ QT += xml TARGET = XmlParser TEMPLATE = app +INCLUDEPATH += /lrde/home/stage/froger_a/olena/milena/ SOURCES += main.cpp \ mainwindow.cpp \ xml.cpp \ scene.cpp \ selection.cpp \ - polygonitem.cpp + polygonitem.cpp \ + runner.cpp \ + toolbar.cpp HEADERS += mainwindow.h \ region.h \ xml.h \ scene.h \ selection.h \ - polygonitem.h + polygonitem.h \ + runner.h \ + toolbar.h FORMS += mainwindow.ui diff --git a/XmlParser/XmlParser.pro.user b/XmlParser/XmlParser.pro.user index 8b1714e..bd2e795 100644 --- a/XmlParser/XmlParser.pro.user +++ b/XmlParser/XmlParser.pro.user @@ -76,14 +76,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-cEQxLJuvtW,guid=fcd36bb11605fca6a463651e005eb9dd</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-1aju09G1Pe,guid=69ec02ba8a70eadde9e5182600601b23</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-r2voTB</value> - <value type="QString">GNOME_KEYRING_PID=13274</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-792wyb</value> + <value type="QString">GNOME_KEYRING_PID=10096</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -95,16 +95,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=13349</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vxZwL13283/agent.13283</value> + <value type="QString">SSH_AGENT_PID=10171</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-VVXGf10105/agent.10105</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmSQLVQW</value> + <value type="QString">WINDOWID=16777252</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm1TO0QW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1358255777.408983-704756310</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1358346215.20665-174033780</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -128,14 +128,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-cEQxLJuvtW,guid=fcd36bb11605fca6a463651e005eb9dd</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-1aju09G1Pe,guid=69ec02ba8a70eadde9e5182600601b23</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-r2voTB</value> - <value type="QString">GNOME_KEYRING_PID=13274</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-792wyb</value> + <value type="QString">GNOME_KEYRING_PID=10096</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -147,16 +147,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=13349</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vxZwL13283/agent.13283</value> + <value type="QString">SSH_AGENT_PID=10171</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-VVXGf10105/agent.10105</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmSQLVQW</value> + <value type="QString">WINDOWID=16777252</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm1TO0QW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1358255777.408983-704756310</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1358346215.20665-174033780</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/XmlParser/mainwindow.cpp b/XmlParser/mainwindow.cpp index 2bf9df8..6ad5237 100644 --- a/XmlParser/mainwindow.cpp +++ b/XmlParser/mainwindow.cpp @@ -6,9 +6,15 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow) { ui->setupUi(this); - ui->graphicsView->setGeometry(0, 0, ui->groupBox->width(), ui->groupBox->height()); + QVBoxLayout *layout = new QVBoxLayout; + layout->addWidget(ui->groupBox); + layout->addWidget(ui->textEdit); + setLayout(layout); + QVBoxLayout *gBLayout = new QVBoxLayout; + gBLayout->addWidget(ui->graphicsView); + ui->groupBox->setLayout(gBLayout); Scene *scene = new Scene(ui->graphicsView); - scene->setSceneRect(/*ui->graphicsView->geometry()*/0, 0, 1000, 1000); + scene->setSceneRect(ui->graphicsView->geometry()); ui->graphicsView->setScene(scene); Xml::parseItems("/tmp/mp00082c_gui.xml", scene); } diff --git a/XmlParser/mainwindow.h b/XmlParser/mainwindow.h index 26cc6f0..47103a3 100644 --- a/XmlParser/mainwindow.h +++ b/XmlParser/mainwindow.h @@ -3,6 +3,7 @@ #include <QMainWindow> #include <QGraphicsView> +#include <QVBoxLayout> #include <QFileDialog> #include "scene.h" #include "xml.h" diff --git a/XmlParser/mainwindow.ui b/XmlParser/mainwindow.ui index 80ee3b4..3340356 100644 --- a/XmlParser/mainwindow.ui +++ b/XmlParser/mainwindow.ui @@ -13,6 +13,9 @@ <property name="windowTitle"> <string>MainWindow</string> </property> + <property name="dockNestingEnabled"> + <bool>false</bool> + </property> <widget class="QWidget" name="centralWidget"> <widget class="QTextEdit" name="textEdit"> <property name="geometry"> @@ -27,7 +30,7 @@ <widget class="QGroupBox" name="groupBox"> <property name="geometry"> <rect> - <x>30</x> + <x>40</x> <y>10</y> <width>971</width> <height>591</height> @@ -54,7 +57,7 @@ <x>0</x> <y>0</y> <width>1035</width> - <height>25</height> + <height>23</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -65,15 +68,6 @@ </widget> <addaction name="menuFile"/> </widget> - <widget class="QToolBar" name="mainToolBar"> - <attribute name="toolBarArea"> - <enum>TopToolBarArea</enum> - </attribute> - <attribute name="toolBarBreak"> - <bool>false</bool> - </attribute> - </widget> - <widget class="QStatusBar" name="statusBar"/> <action name="actionOpen"> <property name="text"> <string>Open</string> diff --git a/XmlParser/runner.cpp b/XmlParser/runner.cpp new file mode 100644 index 0000000..3f91319 --- /dev/null +++ b/XmlParser/runner.cpp @@ -0,0 +1,6 @@ +#include "runner.h" + +Runner::Runner(QObject *parent): + QThread(parent) +{ +} diff --git a/XmlParser/runner.h b/XmlParser/runner.h new file mode 100644 index 0000000..2f303f0 --- /dev/null +++ b/XmlParser/runner.h @@ -0,0 +1,25 @@ +#ifndef RUNNER_H +#define RUNNER_H + +#include <QThread> +#include <QStringList> +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/io/magick/load.hh> + +enum RunMode +{ + Demat, + Export +}; + +class Runner : + public QThread +{ + //Q_OBJECT + + public: + explicit Runner(QObject *parent = 0); +}; + +#endif // RUNNER_H diff --git a/XmlParser/toolbar.cpp b/XmlParser/toolbar.cpp new file mode 100644 index 0000000..4b098a5 --- /dev/null +++ b/XmlParser/toolbar.cpp @@ -0,0 +1,14 @@ +#include "toolbar.h" + +ToolBar::ToolBar(QWidget *parent): + QToolBar("ToolBar", parent) +{ + init(); +} + +void ToolBar::init() +{ + addAction(tr("Open")); + addAction(tr("Segment")); + +} diff --git a/XmlParser/toolbar.h b/XmlParser/toolbar.h new file mode 100644 index 0000000..91aa338 --- /dev/null +++ b/XmlParser/toolbar.h @@ -0,0 +1,17 @@ +#ifndef TOOLBAR_H +#define TOOLBAR_H + +#include <QToolBar> + +class ToolBar : + public QToolBar +{ + public: + explicit ToolBar(QWidget *parent = 0); + explicit ToolBar(const QString& title, QWidget *parent = 0); + + private: + void init(); +}; + +#endif // TOOLBAR_H -- 1.7.2.5