* lazzara/igr/gui/ui_display_seg.h, * lazzara/igr/gui/ui_edit_seg.h, * lazzara/igr/gui/ui_image_viewer.h, * lazzara/igr/gui/ui_main_window.h: Remove.

--- milena/sandbox/ChangeLog | 9 ++ milena/sandbox/lazzara/igr/gui/ui_display_seg.h | 148 ------------------- milena/sandbox/lazzara/igr/gui/ui_edit_seg.h | 130 ----------------- milena/sandbox/lazzara/igr/gui/ui_image_viewer.h | 167 ---------------------- milena/sandbox/lazzara/igr/gui/ui_main_window.h | 92 ------------ 5 files changed, 9 insertions(+), 537 deletions(-) delete mode 100644 milena/sandbox/lazzara/igr/gui/ui_display_seg.h delete mode 100644 milena/sandbox/lazzara/igr/gui/ui_edit_seg.h delete mode 100644 milena/sandbox/lazzara/igr/gui/ui_image_viewer.h delete mode 100644 milena/sandbox/lazzara/igr/gui/ui_main_window.h

diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 4191a7e..cd27478 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,12 @@ +2009-11-03 Guillaume Lazzara z@lrde.epita.fr + + Remove generated files from repository. + + * lazzara/igr/gui/ui_display_seg.h, + * lazzara/igr/gui/ui_edit_seg.h, + * lazzara/igr/gui/ui_image_viewer.h, + * lazzara/igr/gui/ui_main_window.h: Remove. + 2009-10-28 Guillaume Lazzara z@lrde.epita.fr

Fix compilation issues in IGR's code. diff --git a/milena/sandbox/lazzara/igr/gui/ui_display_seg.h b/milena/sandbox/lazzara/igr/gui/ui_display_seg.h deleted file mode 100644 index 5875534..0000000 --- a/milena/sandbox/lazzara/igr/gui/ui_display_seg.h +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'display_seg.ui' -** -** Created: Wed Oct 28 12:45:22 2009 -** by: Qt User Interface Compiler version 4.4.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_DISPLAY_SEG_H -#define UI_DISPLAY_SEG_H - -#include <QtCore/QVariant> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QButtonGroup> -#include <QtGui/QGridLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QVBoxLayout> -#include <QtGui/QWidget> -#include "src/image_viewer.hh" - -QT_BEGIN_NAMESPACE - -class Ui_DisplaySeg -{ -public: - QGridLayout *gridLayout; - QVBoxLayout *verticalLayout; - QHBoxLayout *horizontalLayout; - QLabel *label; - QLineEdit *filepath; - QPushButton *browseBtn; - QHBoxLayout *horizontalLayout_2; - QLabel *label_2; - QLineEdit *segfilepath; - QPushButton *browseSegBtn; - QHBoxLayout *horizontalLayout_3; - QSpacerItem *horizontalSpacer; - QPushButton *loadBtn; - mln::demo::image_viewer *viewer; - - void setupUi(QWidget *DisplaySeg) - { - if (DisplaySeg->objectName().isEmpty()) - DisplaySeg->setObjectName(QString::fromUtf8("DisplaySeg")); - DisplaySeg->resize(400, 300); - gridLayout = new QGridLayout(DisplaySeg); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - horizontalLayout = new QHBoxLayout(); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - label = new QLabel(DisplaySeg); - label->setObjectName(QString::fromUtf8("label")); - - horizontalLayout->addWidget(label); - - filepath = new QLineEdit(DisplaySeg); - filepath->setObjectName(QString::fromUtf8("filepath")); - - horizontalLayout->addWidget(filepath); - - browseBtn = new QPushButton(DisplaySeg); - browseBtn->setObjectName(QString::fromUtf8("browseBtn")); - - horizontalLayout->addWidget(browseBtn); - - - verticalLayout->addLayout(horizontalLayout); - - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); - label_2 = new QLabel(DisplaySeg); - label_2->setObjectName(QString::fromUtf8("label_2")); - - horizontalLayout_2->addWidget(label_2); - - segfilepath = new QLineEdit(DisplaySeg); - segfilepath->setObjectName(QString::fromUtf8("segfilepath")); - - horizontalLayout_2->addWidget(segfilepath); - - browseSegBtn = new QPushButton(DisplaySeg); - browseSegBtn->setObjectName(QString::fromUtf8("browseSegBtn")); - - horizontalLayout_2->addWidget(browseSegBtn); - - - verticalLayout->addLayout(horizontalLayout_2); - - horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); - horizontalSpacer = new QSpacerItem(48, 17, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_3->addItem(horizontalSpacer); - - loadBtn = new QPushButton(DisplaySeg); - loadBtn->setObjectName(QString::fromUtf8("loadBtn")); - - horizontalLayout_3->addWidget(loadBtn); - - - verticalLayout->addLayout(horizontalLayout_3); - - viewer = new mln::demo::image_viewer(DisplaySeg); - viewer->setObjectName(QString::fromUtf8("viewer")); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(viewer->sizePolicy().hasHeightForWidth()); - viewer->setSizePolicy(sizePolicy); - - verticalLayout->addWidget(viewer); - - - gridLayout->addLayout(verticalLayout, 0, 0, 1, 1); - - - retranslateUi(DisplaySeg); - - QMetaObject::connectSlotsByName(DisplaySeg); - } // setupUi - - void retranslateUi(QWidget *DisplaySeg) - { - DisplaySeg->setWindowTitle(QApplication::translate("DisplaySeg", "Form", 0, QApplication::UnicodeUTF8)); - label->setText(QApplication::translate("DisplaySeg", "Image", 0, QApplication::UnicodeUTF8)); - browseBtn->setText(QApplication::translate("DisplaySeg", "&Browse", 0, QApplication::UnicodeUTF8)); - label_2->setText(QApplication::translate("DisplaySeg", "Segmentation", 0, QApplication::UnicodeUTF8)); - browseSegBtn->setText(QApplication::translate("DisplaySeg", "&Browse", 0, QApplication::UnicodeUTF8)); - loadBtn->setText(QApplication::translate("DisplaySeg", "&Load", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(DisplaySeg); - } // retranslateUi - -}; - -namespace Ui { - class DisplaySeg: public Ui_DisplaySeg {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_DISPLAY_SEG_H diff --git a/milena/sandbox/lazzara/igr/gui/ui_edit_seg.h b/milena/sandbox/lazzara/igr/gui/ui_edit_seg.h deleted file mode 100644 index 9d8e07e..0000000 --- a/milena/sandbox/lazzara/igr/gui/ui_edit_seg.h +++ /dev/null @@ -1,130 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'edit_seg.ui' -** -** Created: Wed Oct 28 12:45:22 2009 -** by: Qt User Interface Compiler version 4.4.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_EDIT_SEG_H -#define UI_EDIT_SEG_H - -#include <QtCore/QVariant> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QButtonGroup> -#include <QtGui/QGridLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QVBoxLayout> -#include <QtGui/QWidget> -#include "src/image_viewer.hh" - -QT_BEGIN_NAMESPACE - -class Ui_EditSeg -{ -public: - QGridLayout *gridLayout; - QVBoxLayout *verticalLayout; - QHBoxLayout *horizontalLayout_2; - QLabel *label_2; - QLineEdit *filepath; - QPushButton *browseBtn; - QHBoxLayout *horizontalLayout_3; - QSpacerItem *horizontalSpacer; - QPushButton *reloadBtn; - QPushButton *saveBtn; - mln::demo::image_viewer *viewer; - - void setupUi(QWidget *EditSeg) - { - if (EditSeg->objectName().isEmpty()) - EditSeg->setObjectName(QString::fromUtf8("EditSeg")); - EditSeg->resize(400, 300); - gridLayout = new QGridLayout(EditSeg); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); - label_2 = new QLabel(EditSeg); - label_2->setObjectName(QString::fromUtf8("label_2")); - - horizontalLayout_2->addWidget(label_2); - - filepath = new QLineEdit(EditSeg); - filepath->setObjectName(QString::fromUtf8("filepath")); - - horizontalLayout_2->addWidget(filepath); - - browseBtn = new QPushButton(EditSeg); - browseBtn->setObjectName(QString::fromUtf8("browseBtn")); - - horizontalLayout_2->addWidget(browseBtn); - - - verticalLayout->addLayout(horizontalLayout_2); - - horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); - horizontalSpacer = new QSpacerItem(48, 17, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_3->addItem(horizontalSpacer); - - reloadBtn = new QPushButton(EditSeg); - reloadBtn->setObjectName(QString::fromUtf8("reloadBtn")); - - horizontalLayout_3->addWidget(reloadBtn); - - saveBtn = new QPushButton(EditSeg); - saveBtn->setObjectName(QString::fromUtf8("saveBtn")); - saveBtn->setEnabled(false); - - horizontalLayout_3->addWidget(saveBtn); - - - verticalLayout->addLayout(horizontalLayout_3); - - viewer = new mln::demo::image_viewer(EditSeg); - viewer->setObjectName(QString::fromUtf8("viewer")); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(viewer->sizePolicy().hasHeightForWidth()); - viewer->setSizePolicy(sizePolicy); - - verticalLayout->addWidget(viewer); - - - gridLayout->addLayout(verticalLayout, 0, 0, 1, 1); - - - retranslateUi(EditSeg); - - QMetaObject::connectSlotsByName(EditSeg); - } // setupUi - - void retranslateUi(QWidget *EditSeg) - { - EditSeg->setWindowTitle(QApplication::translate("EditSeg", "Form", 0, QApplication::UnicodeUTF8)); - label_2->setText(QApplication::translate("EditSeg", "Segmentation", 0, QApplication::UnicodeUTF8)); - browseBtn->setText(QApplication::translate("EditSeg", "&Browse", 0, QApplication::UnicodeUTF8)); - reloadBtn->setText(QApplication::translate("EditSeg", "&Reload", 0, QApplication::UnicodeUTF8)); - saveBtn->setText(QApplication::translate("EditSeg", "&Save changes", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(EditSeg); - } // retranslateUi - -}; - -namespace Ui { - class EditSeg: public Ui_EditSeg {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_EDIT_SEG_H diff --git a/milena/sandbox/lazzara/igr/gui/ui_image_viewer.h b/milena/sandbox/lazzara/igr/gui/ui_image_viewer.h deleted file mode 100644 index 01cc5df..0000000 --- a/milena/sandbox/lazzara/igr/gui/ui_image_viewer.h +++ /dev/null @@ -1,167 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'image_viewer.ui' -** -** Created: Wed Oct 28 12:45:22 2009 -** by: Qt User Interface Compiler version 4.4.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_IMAGE_VIEWER_H -#define UI_IMAGE_VIEWER_H - -#include <QtCore/QVariant> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QButtonGroup> -#include <QtGui/QGraphicsView> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QSlider> -#include <QtGui/QSpacerItem> -#include <QtGui/QVBoxLayout> -#include <QtGui/QWidget> - -QT_BEGIN_NAMESPACE - -class Ui_ImageViewer -{ -public: - QVBoxLayout *verticalLayout_2; - QVBoxLayout *verticalLayout; - QHBoxLayout *horizontalLayout_2; - QSpacerItem *horizontalSpacer; - QLabel *zoomLabel; - QPushButton *zoomIn; - QPushButton *zoomOut; - QPushButton *zoomFixed; - QPushButton *zoomOriginal; - QSpacerItem *horizontalSpacer_2; - QGraphicsView *image; - QHBoxLayout *sliderLayout; - QSlider *slider; - QLabel *label_2; - QLabel *frame_nb; - - void setupUi(QWidget *ImageViewer) - { - if (ImageViewer->objectName().isEmpty()) - ImageViewer->setObjectName(QString::fromUtf8("ImageViewer")); - ImageViewer->resize(464, 350); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(ImageViewer->sizePolicy().hasHeightForWidth()); - ImageViewer->setSizePolicy(sizePolicy); - verticalLayout_2 = new QVBoxLayout(ImageViewer); - verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); - verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); - horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_2->addItem(horizontalSpacer); - - zoomLabel = new QLabel(ImageViewer); - zoomLabel->setObjectName(QString::fromUtf8("zoomLabel")); - zoomLabel->setEnabled(false); - - horizontalLayout_2->addWidget(zoomLabel); - - zoomIn = new QPushButton(ImageViewer); - zoomIn->setObjectName(QString::fromUtf8("zoomIn")); - zoomIn->setEnabled(false); - - horizontalLayout_2->addWidget(zoomIn); - - zoomOut = new QPushButton(ImageViewer); - zoomOut->setObjectName(QString::fromUtf8("zoomOut")); - zoomOut->setEnabled(false); - - horizontalLayout_2->addWidget(zoomOut); - - zoomFixed = new QPushButton(ImageViewer); - zoomFixed->setObjectName(QString::fromUtf8("zoomFixed")); - zoomFixed->setEnabled(false); - - horizontalLayout_2->addWidget(zoomFixed); - - zoomOriginal = new QPushButton(ImageViewer); - zoomOriginal->setObjectName(QString::fromUtf8("zoomOriginal")); - zoomOriginal->setEnabled(false); - - horizontalLayout_2->addWidget(zoomOriginal); - - horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_2->addItem(horizontalSpacer_2); - - - verticalLayout->addLayout(horizontalLayout_2); - - image = new QGraphicsView(ImageViewer); - image->setObjectName(QString::fromUtf8("image")); - image->setInteractive(true); - image->setRenderHints(QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing); - - verticalLayout->addWidget(image); - - sliderLayout = new QHBoxLayout(); - sliderLayout->setObjectName(QString::fromUtf8("sliderLayout")); - slider = new QSlider(ImageViewer); - slider->setObjectName(QString::fromUtf8("slider")); - slider->setOrientation(Qt::Horizontal); - slider->setTickPosition(QSlider::TicksAbove); - - sliderLayout->addWidget(slider); - - label_2 = new QLabel(ImageViewer); - label_2->setObjectName(QString::fromUtf8("label_2")); - - sliderLayout->addWidget(label_2); - - frame_nb = new QLabel(ImageViewer); - frame_nb->setObjectName(QString::fromUtf8("frame_nb")); - QFont font; - font.setBold(true); - font.setWeight(75); - frame_nb->setFont(font); - - sliderLayout->addWidget(frame_nb); - - - verticalLayout->addLayout(sliderLayout); - - - verticalLayout_2->addLayout(verticalLayout); - - - retranslateUi(ImageViewer); - - QMetaObject::connectSlotsByName(ImageViewer); - } // setupUi - - void retranslateUi(QWidget *ImageViewer) - { - ImageViewer->setWindowTitle(QApplication::translate("ImageViewer", "Form", 0, QApplication::UnicodeUTF8)); - zoomLabel->setText(QApplication::translate("ImageViewer", "Zoom:", 0, QApplication::UnicodeUTF8)); - zoomIn->setText(QApplication::translate("ImageViewer", "+", 0, QApplication::UnicodeUTF8)); - zoomOut->setText(QApplication::translate("ImageViewer", "-", 0, QApplication::UnicodeUTF8)); - zoomFixed->setText(QApplication::translate("ImageViewer", "Fixed width", 0, QApplication::UnicodeUTF8)); - zoomOriginal->setText(QApplication::translate("ImageViewer", "Original size", 0, QApplication::UnicodeUTF8)); - label_2->setText(QApplication::translate("ImageViewer", "Current Frame :", 0, QApplication::UnicodeUTF8)); - frame_nb->setText(QApplication::translate("ImageViewer", "0", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(ImageViewer); - } // retranslateUi - -}; - -namespace Ui { - class ImageViewer: public Ui_ImageViewer {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_IMAGE_VIEWER_H diff --git a/milena/sandbox/lazzara/igr/gui/ui_main_window.h b/milena/sandbox/lazzara/igr/gui/ui_main_window.h deleted file mode 100644 index 0f1ce23..0000000 --- a/milena/sandbox/lazzara/igr/gui/ui_main_window.h +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'main_window.ui' -** -** Created: Wed Oct 28 13:14:49 2009 -** by: Qt User Interface Compiler version 4.4.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_MAIN_WINDOW_H -#define UI_MAIN_WINDOW_H - -#include <QtCore/QVariant> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QButtonGroup> -#include <QtGui/QGridLayout> -#include <QtGui/QMainWindow> -#include <QtGui/QMenuBar> -#include <QtGui/QStatusBar> -#include <QtGui/QTabWidget> -#include <QtGui/QWidget> -#include "src/display_seg.hh" -#include "src/edit_seg.hh" - -QT_BEGIN_NAMESPACE - -class Ui_MainWindow -{ -public: - QWidget *centralwidget; - QGridLayout *gridLayout; - QTabWidget *tabWidget; - mln::demo::display_seg *Visualization; - mln::demo::edit_seg *Edition; - QMenuBar *menubar; - QStatusBar *statusbar; - - void setupUi(QMainWindow *MainWindow) - { - if (MainWindow->objectName().isEmpty()) - MainWindow->setObjectName(QString::fromUtf8("MainWindow")); - MainWindow->resize(487, 335); - centralwidget = new QWidget(MainWindow); - centralwidget->setObjectName(QString::fromUtf8("centralwidget")); - gridLayout = new QGridLayout(centralwidget); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - tabWidget = new QTabWidget(centralwidget); - tabWidget->setObjectName(QString::fromUtf8("tabWidget")); - Visualization = new mln::demo::display_seg(); - Visualization->setObjectName(QString::fromUtf8("Visualization")); - tabWidget->addTab(Visualization, QString()); - Edition = new mln::demo::edit_seg(); - Edition->setObjectName(QString::fromUtf8("Edition")); - tabWidget->addTab(Edition, QString()); - - gridLayout->addWidget(tabWidget, 0, 0, 1, 1); - - MainWindow->setCentralWidget(centralwidget); - menubar = new QMenuBar(MainWindow); - menubar->setObjectName(QString::fromUtf8("menubar")); - menubar->setGeometry(QRect(0, 0, 487, 31)); - MainWindow->setMenuBar(menubar); - statusbar = new QStatusBar(MainWindow); - statusbar->setObjectName(QString::fromUtf8("statusbar")); - MainWindow->setStatusBar(statusbar); - - retranslateUi(MainWindow); - - tabWidget->setCurrentIndex(0); - - - QMetaObject::connectSlotsByName(MainWindow); - } // setupUi - - void retranslateUi(QMainWindow *MainWindow) - { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Segmentation tools", 0, QApplication::UnicodeUTF8)); - tabWidget->setTabText(tabWidget->indexOf(Visualization), QApplication::translate("MainWindow", "Visualization", 0, QApplication::UnicodeUTF8)); - tabWidget->setTabText(tabWidget->indexOf(Edition), QApplication::translate("MainWindow", "Edition", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(MainWindow); - } // retranslateUi - -}; - -namespace Ui { - class MainWindow: public Ui_MainWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_MAIN_WINDOW_H