This commit is contained in:
Vladislav Khorev 2013-06-18 20:52:07 +00:00
parent 91d5cabd26
commit 3f6d43ec7b
6 changed files with 41 additions and 2 deletions

View File

@ -159,5 +159,10 @@ void TAnimation::LoadFrame()
}
void TAnimation::Clear()
{
FrameList.clear();
}

View File

@ -97,6 +97,7 @@ public:
void FillSheet(boost::shared_ptr<QPixmap> sheetPixmap, std::vector<TFrameData>& frameDataArr);
void Clear();
public slots:
void LoadFrame();

View File

@ -17,7 +17,7 @@ SOURCES += main.cpp\
HEADERS += mainwindow.h \
Animation.h
INCLUDEPATH += $$(LibsPath)/boost_1_47_0
DEPENDPATH += $$(LibsPath)/boost_1_47_0
INCLUDEPATH += $$(LibsPath)/boost_1_52_0
DEPENDPATH += $$(LibsPath)/boost_1_52_0
FORMS += mainwindow.ui

View File

@ -59,6 +59,8 @@ void MainWindow::SetAnimation(TAnimation* animation)
QObject::connect(ui->SaveSheetButton, SIGNAL(pressed()), this, SLOT(SaveSheet()));
QObject::connect(ui->SaveAnimParamsButton, SIGNAL(pressed()), this, SLOT(SaveAnimationParams()));
QObject::connect(ui->AnimateCheckBox, SIGNAL(stateChanged(int)), this, SLOT(AnimateCheckBoxStateChanged(int)));
QObject::connect(ui->ClearButton, SIGNAL(pressed()), this, SLOT(Clear()));
QObject::connect(&AnimTimer, SIGNAL(timeout()), this, SLOT(TimerTimeout()));
@ -292,3 +294,18 @@ void MainWindow::LoadFrame(const std::string& text)
ui->FrameList->addItem(QString(text.c_str()));
}
void MainWindow::Clear()
{
AnimTimer.stop();
//ui->FrameImage->pixmap()->fill();
ui->AnimateCheckBox->setChecked(false);
ui->OutputXmlFile->clear();
ui->FrameList->clear();
Animation->Clear();
}

View File

@ -44,6 +44,8 @@ public slots:
void AnimateCheckBoxStateChanged(int state);
void TimerTimeout();
void Clear();
private:
Ui::MainWindow *ui;

View File

@ -342,6 +342,19 @@
<string>Animate</string>
</property>
</widget>
<widget class="QPushButton" name="ClearButton">
<property name="geometry">
<rect>
<x>140</x>
<y>30</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Clear</string>
</property>
</widget>
<zorder>frame_2</zorder>
<zorder>LoadFrameButton</zorder>
<zorder>frame</zorder>
@ -363,6 +376,7 @@
<zorder>SaveSheetButton</zorder>
<zorder>SaveAnimParamsButton</zorder>
<zorder>AnimateCheckBox</zorder>
<zorder>ClearButton</zorder>
</widget>
<widget class="QToolBar" name="mainToolBar">
<attribute name="toolBarArea">