Skip to content

Commit 226aa29

Browse files
committed
Initial commit
0 parents  commit 226aa29

File tree

12 files changed

+1341
-0
lines changed

12 files changed

+1341
-0
lines changed

.gitattributes

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

.gitignore

Lines changed: 215 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
1+
#################
2+
## Eclipse
3+
#################
4+
5+
*.pydevproject
6+
.project
7+
.metadata
8+
bin/
9+
tmp/
10+
*.tmp
11+
*.bak
12+
*.swp
13+
*~.nib
14+
local.properties
15+
.classpath
16+
.settings/
17+
.loadpath
18+
19+
# External tool builders
20+
.externalToolBuilders/
21+
22+
# Locally stored "Eclipse launch configurations"
23+
*.launch
24+
25+
# CDT-specific
26+
.cproject
27+
28+
# PDT-specific
29+
.buildpath
30+
31+
32+
#################
33+
## Visual Studio
34+
#################
35+
36+
## Ignore Visual Studio temporary files, build results, and
37+
## files generated by popular Visual Studio add-ons.
38+
39+
# User-specific files
40+
*.suo
41+
*.user
42+
*.sln.docstates
43+
44+
# Build results
45+
46+
[Dd]ebug/
47+
[Rr]elease/
48+
x64/
49+
build/
50+
[Bb]in/
51+
[Oo]bj/
52+
53+
# MSTest test Results
54+
[Tt]est[Rr]esult*/
55+
[Bb]uild[Ll]og.*
56+
57+
*_i.c
58+
*_p.c
59+
*.ilk
60+
*.meta
61+
*.obj
62+
*.pch
63+
*.pdb
64+
*.pgc
65+
*.pgd
66+
*.rsp
67+
*.sbr
68+
*.tlb
69+
*.tli
70+
*.tlh
71+
*.tmp
72+
*.tmp_proj
73+
*.log
74+
*.vspscc
75+
*.vssscc
76+
.builds
77+
*.pidb
78+
*.log
79+
*.scc
80+
81+
# Visual C++ cache files
82+
ipch/
83+
*.aps
84+
*.ncb
85+
*.opensdf
86+
*.sdf
87+
*.cachefile
88+
89+
# Visual Studio profiler
90+
*.psess
91+
*.vsp
92+
*.vspx
93+
94+
# Guidance Automation Toolkit
95+
*.gpState
96+
97+
# ReSharper is a .NET coding add-in
98+
_ReSharper*/
99+
*.[Rr]e[Ss]harper
100+
101+
# TeamCity is a build add-in
102+
_TeamCity*
103+
104+
# DotCover is a Code Coverage Tool
105+
*.dotCover
106+
107+
# NCrunch
108+
*.ncrunch*
109+
.*crunch*.local.xml
110+
111+
# Installshield output folder
112+
[Ee]xpress/
113+
114+
# DocProject is a documentation generator add-in
115+
DocProject/buildhelp/
116+
DocProject/Help/*.HxT
117+
DocProject/Help/*.HxC
118+
DocProject/Help/*.hhc
119+
DocProject/Help/*.hhk
120+
DocProject/Help/*.hhp
121+
DocProject/Help/Html2
122+
DocProject/Help/html
123+
124+
# Click-Once directory
125+
publish/
126+
127+
# Publish Web Output
128+
*.Publish.xml
129+
*.pubxml
130+
131+
# NuGet Packages Directory
132+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
133+
#packages/
134+
135+
# Windows Azure Build Output
136+
csx
137+
*.build.csdef
138+
139+
# Windows Store app package directory
140+
AppPackages/
141+
142+
# Others
143+
sql/
144+
*.Cache
145+
ClientBin/
146+
[Ss]tyle[Cc]op.*
147+
~$*
148+
*~
149+
*.dbmdl
150+
*.[Pp]ublish.xml
151+
*.pfx
152+
*.publishsettings
153+
154+
# RIA/Silverlight projects
155+
Generated_Code/
156+
157+
# Backup & report files from converting an old project file to a newer
158+
# Visual Studio version. Backup files are not needed, because we have git ;-)
159+
_UpgradeReport_Files/
160+
Backup*/
161+
UpgradeLog*.XML
162+
UpgradeLog*.htm
163+
164+
# SQL Server files
165+
App_Data/*.mdf
166+
App_Data/*.ldf
167+
168+
#############
169+
## Windows detritus
170+
#############
171+
172+
# Windows image file caches
173+
Thumbs.db
174+
ehthumbs.db
175+
176+
# Folder config file
177+
Desktop.ini
178+
179+
# Recycle Bin used on file shares
180+
$RECYCLE.BIN/
181+
182+
# Mac crap
183+
.DS_Store
184+
185+
186+
#############
187+
## Python
188+
#############
189+
190+
*.py[co]
191+
192+
# Packages
193+
*.egg
194+
*.egg-info
195+
dist/
196+
build/
197+
eggs/
198+
parts/
199+
var/
200+
sdist/
201+
develop-eggs/
202+
.installed.cfg
203+
204+
# Installer logs
205+
pip-log.txt
206+
207+
# Unit test / coverage reports
208+
.coverage
209+
.tox
210+
211+
#Translations
212+
*.mo
213+
214+
#Mr Developer
215+
.mr.developer.cfg

Evolve.pro

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#-------------------------------------------------
2+
#
3+
# Project created by QtCreator 2014-05-07T22:53:27
4+
#
5+
#-------------------------------------------------
6+
7+
QT += core gui svg
8+
9+
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
10+
11+
TARGET = Evolve
12+
TEMPLATE = app
13+
14+
15+
SOURCES += main.cpp\
16+
widget.cpp \
17+
poly.cpp \
18+
progressdialog.cpp
19+
20+
HEADERS += widget.h \
21+
poly.h \
22+
progressdialog.h
23+
24+
FORMS += widget.ui \
25+
progressdialog.ui
26+
27+
CONFIG += c++11
28+
29+
QMAKE_CXXFLAGS_RELEASE += -O3 -march=native

main.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#include "widget.h"
2+
#include <QApplication>
3+
4+
QApplication* app;
5+
6+
int main(int argc, char *argv[])
7+
{
8+
QApplication a(argc, argv);
9+
app = &a;
10+
Widget w;
11+
w.show();
12+
13+
return a.exec();
14+
}
15+
16+
/**
17+
*
18+
* TODO
19+
* Make the DNA loading size independent. If it's not the same size, then resize the polys. It's a vector.
20+
*
21+
* Make an option to only redraw around a particular poly, in a bounding box around this poly
22+
*
23+
* The crash might be because we write to an image while it's trying to render it
24+
* Careful with writing to variables from other threads
25+
*
26+
*/

poly.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#include "poly.h"
2+
3+
Poly::Poly()
4+
{
5+
6+
}
7+
8+
QDataStream& operator<< (QDataStream& stream, const Poly& poly)
9+
{
10+
stream << poly.color;
11+
stream << poly.points;
12+
return stream;
13+
}
14+
15+
QDataStream& operator>> (QDataStream& stream, Poly& poly)
16+
{
17+
stream >> poly.color;
18+
stream >> poly.points;
19+
return stream;
20+
}

poly.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#ifndef POLY_H
2+
#define POLY_H
3+
4+
#include <QVector>
5+
#include <QPair>
6+
#include <QColor>
7+
#include <QPoint>
8+
#include <QDataStream>
9+
#include "stdint.h"
10+
11+
12+
struct Poly
13+
{
14+
public:
15+
Poly();
16+
17+
public:
18+
QVector<QPoint> points;
19+
QColor color;
20+
};
21+
22+
QDataStream& operator<< (QDataStream& stream, const Poly& poly);
23+
QDataStream& operator>> (QDataStream& stream, Poly& poly);
24+
25+
#endif // POLY_H

progressdialog.cpp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#include "progressdialog.h"
2+
#include "ui_progressdialog.h"
3+
4+
ProgressDialog::ProgressDialog(QWidget *parent) :
5+
QDialog(parent),
6+
ui(new Ui::ProgressDialog)
7+
{
8+
ui->setupUi(this);
9+
}
10+
11+
ProgressDialog::~ProgressDialog()
12+
{
13+
delete ui;
14+
}
15+
16+
void ProgressDialog::setMax(int max)
17+
{
18+
ui->progressBar->setMaximum(max);
19+
}
20+
21+
void ProgressDialog::increment()
22+
{
23+
ui->progressBar->setValue(ui->progressBar->value()+1);
24+
}
25+
26+
void ProgressDialog::setProgress(int progress)
27+
{
28+
ui->progressBar->setValue(progress);
29+
}

progressdialog.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#ifndef PROGRESSDIALOG_H
2+
#define PROGRESSDIALOG_H
3+
4+
#include <QDialog>
5+
6+
namespace Ui {
7+
class ProgressDialog;
8+
}
9+
10+
class ProgressDialog : public QDialog
11+
{
12+
Q_OBJECT
13+
14+
public:
15+
explicit ProgressDialog(QWidget *parent = 0);
16+
void setMax(int max);
17+
void increment();
18+
void setProgress(int progress);
19+
~ProgressDialog();
20+
21+
private:
22+
Ui::ProgressDialog *ui;
23+
};
24+
25+
#endif // PROGRESSDIALOG_H

0 commit comments

Comments
 (0)