Skip to content

Commit 92b6125

Browse files
mondusmondus
committed
first commit from SVN of v3 branch
1 parent f346997 commit 92b6125

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4277
-1594
lines changed

‎README‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ FLAME Visualiser
44

55
To compile you will need Qt4.
66
The package for Ubuntu is called: libqt4-dev
7-
You will also need a C++ compiler.
8-
The package for a build environment is: build-essential
9-
You will also need OpenGL dev packages:
10-
libgl1-mesa-dev
11-
libglu1-mesa-dev
127

138
To compile type:
149

@@ -17,16 +12,14 @@ To compile type:
1712

1813
To run:
1914

20-
./FLAME\ Visualiser
15+
./flame_visualiser
2116

2217
*** MAC OSX ***
2318

2419
To compile you will need Qt4.
2520
Download from the Qt web site.
2621
Normally qmake creates xcode projects on mac.
2722
To stop this use the -spec flag below.
28-
You will also need a C++ compiler. Install Xcode either from
29-
provided disc or from the Mac App Store.
3023

3124
To compile type:
3225

@@ -35,14 +28,12 @@ To compile type:
3528

3629
To run:
3730

38-
open FLAME\ Visualiser.app
31+
open flame_editor.app
3932

4033
If you have any problems try using Qt Creator.
4134

4235
*** WINDOWS ***
4336

4437
To compile you will need Qt4.
4538
Download from the Qt web site.
46-
If you don't have MinGW already installed select the version of Qt Creator
47-
that includes MinGW (a C++ compiler for Windows).
4839
Use Qt Creator to open the project flame_visualiser.pro and compile.

‎agentdialog.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ AgentDialog::AgentDialog(Agent * a, QWidget *parent)
1313
ui->setupUi(this);
1414
agent = a;
1515

16-
QString title = "Agent '";
17-
title.append(a->agentType);
18-
title.append("' Memory");
19-
setWindowTitle(title);
16+
setWindowTitle("Agent Memory");
2017

2118
ui->tableWidget_Variables->setColumnCount(2);
2219
ui->tableWidget_Variables->setRowCount(a->tags.size());

‎configxmlreader.cpp‎

Lines changed: 3 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
ConfigXMLReader::ConfigXMLReader(VisualSettingsModel *vsm,
1515
GraphSettingsModel *gsm, QString *rD, TimeScale * ts, double *r,
1616
float * xr, float *yr, float *xm, float * ym, float * zm,
17-
int * delay, float * oz, int * vd, QColor * vbg) {
17+
int * delay, float * oz, int * vd) {
1818
vsmodel = vsm;
1919
gsmodel = gsm;
2020
resultsData = rD;
@@ -28,7 +28,6 @@ ConfigXMLReader::ConfigXMLReader(VisualSettingsModel *vsm,
2828
delayTime = delay;
2929
orthoZoom = oz;
3030
visual_dimension = vd;
31-
backgroundColour = vbg;
3231
}
3332

3433
bool ConfigXMLReader::read(QIODevice * device) {
@@ -64,11 +63,6 @@ void ConfigXMLReader::readUnknownElement() {
6463
}
6564
}
6665

67-
/*!
68-
* \brief Read flame visualiser config xml
69-
*
70-
* Read flame visualiser config xml.
71-
*/
7266
void ConfigXMLReader::readConfig() {
7367
Q_ASSERT(isStartElement() && name() == "flame_visualiser_config");
7468

@@ -95,11 +89,6 @@ void ConfigXMLReader::readConfig() {
9589
}
9690
}
9791

98-
/*!
99-
* \brief Read flame visualiser config results data xml
100-
*
101-
* Read flame visualiser config results data xml.
102-
*/
10392
void ConfigXMLReader::readResultsData() {
10493
while (!atEnd()) {
10594
readNext();
@@ -116,11 +105,6 @@ void ConfigXMLReader::readResultsData() {
116105
}
117106
}
118107

119-
/*!
120-
* \brief Read flame visualiser config time scale xml
121-
*
122-
* Read flame visualiser config time scale xml.
123-
*/
124108
void ConfigXMLReader::readTimeScale() {
125109
QString enable;
126110

@@ -160,11 +144,6 @@ void ConfigXMLReader::readTimeScale() {
160144
}
161145
}
162146

163-
/*!
164-
* \brief Read flame visualiser config animation xml
165-
*
166-
* Read flame visualiser config animation xml.
167-
*/
168147
void ConfigXMLReader::readAnimation() {
169148
while (!atEnd()) {
170149
readNext();
@@ -182,16 +161,10 @@ void ConfigXMLReader::readAnimation() {
182161
}
183162
}
184163

185-
/*!
186-
* \brief Read flame visualiser config visual xml
187-
*
188-
* Read flame visualiser config visual xml.
189-
*/
190164
void ConfigXMLReader::readVisual() {
191165
/* Defaults if tags missing */
192166
*visual_dimension = 3;
193167
*orthoZoom = 1.0;
194-
*backgroundColour = Qt::white;
195168

196169
while (!atEnd()) {
197170
readNext();
@@ -216,8 +189,6 @@ void ConfigXMLReader::readVisual() {
216189
*zmove = readElementText().toFloat();
217190
else if (name() == "orthoZoom")
218191
*orthoZoom = readElementText().toFloat();
219-
else if (name() == "backgroundColour")
220-
*backgroundColour = readColour();
221192
else if (name() == "rules")
222193
readRules();
223194
else
@@ -226,11 +197,6 @@ void ConfigXMLReader::readVisual() {
226197
}
227198
}
228199

229-
/*!
230-
* \brief Read flame visualiser config rules xml
231-
*
232-
* Read flame visualiser config rules xml.
233-
*/
234200
void ConfigXMLReader::readRules() {
235201
while (!atEnd()) {
236202
readNext();
@@ -247,11 +213,6 @@ void ConfigXMLReader::readRules() {
247213
}
248214
}
249215

250-
/*!
251-
* \brief Read flame visualiser config rule xml
252-
*
253-
* Read flame visualiser config rule xml.
254-
*/
255216
void ConfigXMLReader::readRule() {
256217
QString agentType;
257218
Condition condition;
@@ -297,11 +258,6 @@ void ConfigXMLReader::readRule() {
297258
vsmodel->addRule(agentType, condition, x, y, z, shape, colour, enabled);
298259
}
299260

300-
/*!
301-
* \brief Read flame visualiser config shape xml
302-
*
303-
* Read flame visualiser config shape xml.
304-
*/
305261
Shape ConfigXMLReader::readShape() {
306262
Shape shape;
307263
QString enable;
@@ -318,6 +274,8 @@ Shape ConfigXMLReader::readShape() {
318274
shape.setShape(readElementText());
319275
} else if (name() == "dimension") {
320276
shape.setDimension((readElementText().toDouble()));
277+
} else if (name() == "quality") {
278+
shape.setQuality((readElementText().toInt()));
321279
} else if (name() == "useVariable") {
322280
enable = readElementText();
323281
if (QString::compare(enable, "true") == 0)
@@ -378,11 +336,6 @@ Shape ConfigXMLReader::readShape() {
378336
return shape;
379337
}
380338

381-
/*!
382-
* \brief Read flame visualiser config position xml
383-
*
384-
* Read flame visualiser config position xml.
385-
*/
386339
Position ConfigXMLReader::readPosition() {
387340
Position position;
388341
QString enable;
@@ -413,11 +366,6 @@ Position ConfigXMLReader::readPosition() {
413366
return position;
414367
}
415368

416-
/*!
417-
* \brief Read flame visualiser config condition xml
418-
*
419-
* Read flame visualiser config condition xml.
420-
*/
421369
Condition ConfigXMLReader::readCondition() {
422370
Condition condition;
423371
QString enable;
@@ -450,11 +398,6 @@ Condition ConfigXMLReader::readCondition() {
450398
return condition;
451399
}
452400

453-
/*!
454-
* \brief Read flame visualiser config colour xml
455-
*
456-
* Read flame visualiser config colour xml.
457-
*/
458401
QColor ConfigXMLReader::readColour() {
459402
QColor colour;
460403

@@ -481,11 +424,6 @@ QColor ConfigXMLReader::readColour() {
481424
return colour;
482425
}
483426

484-
/*!
485-
* \brief Read flame visualiser config lhs variable xml
486-
*
487-
* Read flame visualiser config lhs variable xml.
488-
*/
489427
QString ConfigXMLReader::readLhs() {
490428
QString agentType;
491429

@@ -506,11 +444,6 @@ QString ConfigXMLReader::readLhs() {
506444
return agentType;
507445
}
508446

509-
/*!
510-
* \brief Read flame visualiser config rhs value xml
511-
*
512-
* Read flame visualiser config rhs value xml.
513-
*/
514447
double ConfigXMLReader::readRhs() {
515448
double value = 0.0;
516449

@@ -531,11 +464,6 @@ double ConfigXMLReader::readRhs() {
531464
return value;
532465
}
533466

534-
/*!
535-
* \brief Read flame visualiser config graph xml
536-
*
537-
* Read flame visualiser config graph xml.
538-
*/
539467
void ConfigXMLReader::readGraph() {
540468
while (!atEnd()) {
541469
readNext();
@@ -552,11 +480,6 @@ void ConfigXMLReader::readGraph() {
552480
}
553481
}
554482

555-
/*!
556-
* \brief Read flame visualiser config plot xml
557-
*
558-
* Read flame visualiser config plot xml.
559-
*/
560483
void ConfigXMLReader::readPlot() {
561484
QString graphNumber;
562485
QString xAxis;
@@ -589,11 +512,6 @@ void ConfigXMLReader::readPlot() {
589512
gsmodel->addPlot(graphNumber, xAxis, yAxis, condition, colour, false);
590513
}
591514

592-
/*!
593-
* \brief Read flame visualiser config x-axis xml
594-
*
595-
* Read flame visualiser config x-axis xml.
596-
*/
597515
QString ConfigXMLReader::readXaxis() {
598516
QString type;
599517

@@ -614,11 +532,6 @@ QString ConfigXMLReader::readXaxis() {
614532
return type;
615533
}
616534

617-
/*!
618-
* \brief Read flame visualiser config y-axis xml
619-
*
620-
* Read flame visualiser config y-axis xml.
621-
*/
622535
QString ConfigXMLReader::readYaxis() {
623536
QString agentType;
624537

‎configxmlreader.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ConfigXMLReader : public QXmlStreamReader {
2020
ConfigXMLReader(VisualSettingsModel * vsm, GraphSettingsModel * gsm,
2121
QString * rD, TimeScale * ts, double * r,
2222
float * xr, float *yr, float *xm, float * ym, float * zm,
23-
int * delay, float * oz, int * vd, QColor *vbg);
23+
int * delay, float * oz, int * vd);
2424

2525
bool read(QIODevice * device);
2626

@@ -57,7 +57,6 @@ class ConfigXMLReader : public QXmlStreamReader {
5757
int * delayTime;
5858
float * orthoZoom;
5959
int * visual_dimension;
60-
QColor * backgroundColour;
6160
};
6261

6362
#endif // CONFIGXMLREADER_H_

‎flame_visualiser.pro‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,17 @@
77
QT += core gui
88
QT += opengl
99

10-
# Qt 4.8 Doesn't include OpenGL Glu library automatically on linux
11-
unix:!macx:LIBS *= -lGLU
12-
1310
TEMPLATE = app
14-
TARGET = "FLAME Visualiser"
15-
16-
# Qt 4.7 Doesn't like spaces in target name on windows
17-
QT_VERSION = $$[QT_VERSION]
18-
QT_VERSION = $$split(QT_VERSION, ".")
19-
QT_VER_MAJ = $$member(QT_VERSION, 0)
20-
QT_VER_MIN = $$member(QT_VERSION, 1)
21-
lessThan(QT_VER_MIN, 8):lessThan(QT_VER_MAJ, 5) {
22-
win32:TARGET = FLAME_Visualiser
11+
macx {
12+
TARGET = "FLAME Visualiser"
13+
} else {
14+
TARGET = flame_visualiser
2315
}
24-
2516
macx:ICON = flame_icon_v.icns
2617
win32:RC_FILE = flame-v.rc
2718

28-
SOURCES += main.cpp
29-
30-
test {
31-
SOURCES -= main.cpp
32-
SOURCES += test_flame_visualiser.cpp
33-
CONFIG += qtestlib
34-
QMAKE_CXXFLAGS +=-DTESTBUILD
35-
}
36-
37-
SOURCES += mainwindow.cpp \
19+
SOURCES += main.cpp\
20+
mainwindow.cpp \
3821
glwidget.cpp \
3922
zeroxmlreader.cpp \
4023
visualsettingsmodel.cpp \
@@ -60,8 +43,7 @@ SOURCES += mainwindow.cpp \
6043
timedialog.cpp \
6144
agentdialog.cpp \
6245
restrictaxesdialog.cpp \
63-
iterationinfodialog.cpp \
64-
timescale.cpp
46+
iterationinfodialog.cpp
6547

6648
HEADERS += mainwindow.h \
6749
glwidget.h \
@@ -93,8 +75,7 @@ HEADERS += mainwindow.h \
9375
agentdialog.h \
9476
restrictaxesdialog.h \
9577
dimension.h \
96-
iterationinfodialog.h \
97-
ruleagent.h
78+
iterationinfodialog.h
9879

9980
FORMS += mainwindow.ui \
10081
positiondialog.ui \
@@ -105,3 +86,5 @@ FORMS += mainwindow.ui \
10586
agentdialog.ui \
10687
restrictaxesdialog.ui \
10788
iterationinfodialog.ui
89+
90+
OTHER_FILES +=

0 commit comments

Comments
 (0)