------------------------------------------------------------------------
r1457 | sega | 2008-08-08 17:07:56 +0200 (pią, 08 sie 2008) | 1 line
Changed paths:
M /trunk/gui/qt3/GLSimulationPlayerViewer.cpp
M /trunk/gui/qt3/QtSimulationPlayer.cpp
M /trunk/gui/qt3/QtSimulationPlayer.hpp
M /trunk/pkg/common/Engine/FilterEngine/FilterEngine.cpp
M /trunk/pkg/common/Engine/FilterEngine/FilterEngine.hpp
Fixed small bugs and misprints
------------------------------------------------------------------------
Index: pkg/common/Engine/FilterEngine/FilterEngine.hpp
===================================================================
--- pkg/common/Engine/FilterEngine/FilterEngine.hpp (revision 1456)
+++ pkg/common/Engine/FilterEngine/FilterEngine.hpp (revision 1457)
@@ -13,7 +13,7 @@
class FilterEngine : public DeusExMachina {
public:
/// Activation of filtration from GUI
- static bool isFilterationActivated;
+ static bool isFiltrationActivated;
/// Activation of the filter
bool isFilterActivated;
@@ -24,7 +24,7 @@
void registerAttributes()
{
-// REGISTER_ATTRIBUTE(isFilterationActivated);
+// REGISTER_ATTRIBUTE(isFiltrationActivated);
REGISTER_ATTRIBUTE(isFilterActivated);
}
Index: pkg/common/Engine/FilterEngine/FilterEngine.cpp
===================================================================
--- pkg/common/Engine/FilterEngine/FilterEngine.cpp (revision 1456)
+++ pkg/common/Engine/FilterEngine/FilterEngine.cpp (revision 1457)
@@ -8,7 +8,7 @@
#include "FilterEngine.hpp"
-bool FilterEngine::isFilterationActivated = false;
+bool FilterEngine::isFiltrationActivated = false;
FilterEngine::FilterEngine() : DeusExMachina(), isFilterActivated(false)
{
@@ -16,5 +16,5 @@
bool FilterEngine::isActivated()
{
- return FilterEngine::isFilterationActivated && isFilterActivated;
+ return FilterEngine::isFiltrationActivated && isFilterActivated;
}
Index: gui/qt3/GLSimulationPlayerViewer.cpp
===================================================================
--- gui/qt3/GLSimulationPlayerViewer.cpp (revision 1456)
+++ gui/qt3/GLSimulationPlayerViewer.cpp (revision 1457)
@@ -135,6 +135,7 @@
if(dIter->leaf().find(inputBaseName)!=0 ||
filesystem::extension(*dIter)==".rgb" ||
algorithm::ends_with(dIter->string(),".rgb.bz2") ||
filesystem::is_directory(*dIter) || !filesystem::exists(*dIter)) continue;
xyzNames.push_back(dIter->string());
}
+ xyzNames.sort();
} else { /* load from sqlite database */
con=shared_ptr<sqlite3x::sqlite3_connection>(new
sqlite3x::sqlite3_connection(fileName));
LOG_DEBUG("Opened sqlite db "<<fileName);
Index: gui/qt3/QtSimulationPlayer.cpp
===================================================================
--- gui/qt3/QtSimulationPlayer.cpp (revision 1456)
+++ gui/qt3/QtSimulationPlayer.cpp (revision 1457)
@@ -29,7 +29,7 @@
void QtSimulationPlayer::pbStepClicked(){
glSimulationPlayerViewer->stopAnimation();
glSimulationPlayerViewer->doOneStep(); }
void QtSimulationPlayer::pbResetClicked(){ setParameters();
glSimulationPlayerViewer->reset();}
void QtSimulationPlayer::cbSaveSnapShotsToggled(bool b){
glSimulationPlayerViewer->saveSnapShots=b;}
-void QtSimulationPlayer::cbAllowFilterationToggled(bool b){
FilterEngine::isFilterationActivated=b; }
+void QtSimulationPlayer::cbAllowFiltrationToggled(bool b){
FilterEngine::isFiltrationActivated=b; }
void QtSimulationPlayer::closeEvent(QCloseEvent *e){
QtGeneratedSimulationPlayer::closeEvent(e); emit closeSignal(); }
@@ -47,6 +47,7 @@
if (!directory.empty()) leInputDirectory->setText(directory);
}
void QtSimulationPlayer::pbLoadClicked(){
+ glSimulationPlayerViewer->stride=sbStride->value();
glSimulationPlayerViewer->load(leInputConfigFile->text());
leInputBaseName->setText(glSimulationPlayerViewer->inputBaseName);
leInputDirectory->setText(glSimulationPlayerViewer->inputBaseDirectory);
Index: gui/qt3/QtSimulationPlayer.hpp
===================================================================
--- gui/qt3/QtSimulationPlayer.hpp (revision 1456)
+++ gui/qt3/QtSimulationPlayer.hpp (revision 1457)
@@ -35,7 +35,7 @@
public slots : virtual void pbStepClicked();
public slots : virtual void pbResetClicked();
- public slots : virtual void cbAllowFilterationToggled(bool b);
+ public slots : virtual void cbAllowFiltrationToggled(bool b);
protected : void closeEvent(QCloseEvent *);
// void keyPressEvent(QKeyEvent
*){};
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
