New fract4dc interface

.travis.yml

@@ -10,9 +10,9 @@ before_install:
   sudo apt-get install -y libgirepository1.0-dev gir1.2-gtk-3.0
 install:
   - python setup.py build
-  - pip install tox-travis pillow pygobject pylint
+  - pip install tox-travis pylint
 script:
-  - ./bin/pylint.sh
+  - ./bin/pylint.sh || travis_terminate 1;
   - tox
 notifications:
   email: false

fract4d/b.sh → bin/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-pushd ..
+
 rm -rf build
+rm fract4d/*.so
 ./setup.py build
-popd

bin/clean.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rf build
+rm fract4d/*.so
+rm -rf .pytest_cache
+rm -rf .tox

bin/pylint.sh

@@ -1,2 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
 pylint *.py fract4d fract4d_compiler fract4dgui
+
+if [[ $? == 0 ]]
+then
+  echo "pylint passed successfully"
+else
+  exit 1
+fi

docker/Dockerfile

@@ -9,12 +9,20 @@ RUN \
     apt-get -y upgrade && \
     apt-get -y install libpng-dev libjpeg-dev python3-dev gtk3.0 libcairo2-dev python3-cairo python3-gi-cairo pkg-config python3-pip xvfb
 
+# bin/run_builds.sh deps
+RUN apt-get -y install software-properties-common && \
+    add-apt-repository -y ppa:deadsnakes/ppa && \
+    apt-get -y install python3.5 python3.5-dev python3.6 python3.6-dev python3.7 python3.7-dev python3.8 python3.8-dev
 
-# deps for bin/run_*.sh scripts
-RUN pip3 install pillow pylint pytest tox
+# bin/run_pylint.sh deps
+RUN pip3 install pylint
 
-# other deps
-RUN apt-get -y install libgirepository1.0-dev gir1.2-gtk-3.0
+# bin/run_pytest.sh deps
+RUN pip3 install pytest
+
+# bin/run_tox.sh deps
+RUN apt-get -y install libgirepository1.0-dev
+RUN pip3 install tox
 
 # Xvfb (in memory x11 server) setup
 ENV DISPLAY :99

docker/bin/run_builds.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+docker-compose up -d --build
+docker-compose exec server bash -c "rm -rf build && \
+                                    rm fract4d/*.so"
+docker-compose exec server bash -c "python3.5 ./setup.py build && \
+                                    python3.6 ./setup.py build && \
+                                    python3.7 ./setup.py build && \
+                                    python3.8 ./setup.py build"
+docker-compose down

docker/bin/run_clean.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+docker-compose up -d
+docker-compose exec server bash -c "rm -rf build && \
+                                    rm fract4d/*.so && \
+                                    rm -rf .pytest_cache && \
+                                    rm -rf .tox"
+docker-compose down

docker/bin/run_pylint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+docker-compose up -d --build
+docker-compose exec server bash -c "rm -rf build && \
+                                    rm fract4d/*.so"
+docker-compose exec server bash -c "python3 setup.py build && \
+                                    ./bin/pylint.sh"
+docker-compose down

docker/bin/run_test.sh

@@ -1,4 +1,8 @@
+#!/bin/bash
+
 docker-compose up -d --build
-# docker-compose exec server bash -c "pytest -s test.py::Test::testGenerateMandelbrot"
-docker-compose exec server bash -c "rm -rf build && python3 setup.py build && ./test.py"
+docker-compose exec server bash -c "rm -rf build && \
+                                    rm fract4d/*.so"
+docker-compose exec server bash -c "python3 setup.py build && \
+                                    ./test.py"
 docker-compose down

docker/bin/run_tox.sh

@@ -1,3 +1,11 @@
+#!/bin/bash
+
 docker-compose up -d --build
-docker-compose exec server bash -c "rm -rf build && python3 setup.py build && tox"
+docker-compose exec server bash -c "rm -rf build && \
+                                    rm fract4d/*.so"
+docker-compose exec server bash -c "python3.5 ./setup.py build && \
+                                    python3.6 ./setup.py build && \
+                                    python3.7 ./setup.py build && \
+                                    python3.8 ./setup.py build && \
+                                    tox"
 docker-compose down

examples/README.md

@@ -0,0 +1,41 @@
+# EXAMPLES
+
+*Note: for all exmples make sure you have performed the setup previously:*
+```
+./setup.py build
+```
+
+## Python examples
+### Creating a simple mandelbrot using fract4dc.controller
+
+Execute:
+```
+examples/python/simple_mandelbrot.py
+```
+Then you should see a new file under `examples/output`.
+
+
+## C++ examples
+For these examples you'll need [docker](https://docs.docker.com/get-docker/)
+
+### Creating a simple mandelbrot
+Execute:
+```
+examples/cpp/simple_mandelbrot.sh
+```
+Then you should see a new file under `examples/output`.
+
+### Creating a simple mandelbrot using multiple threads
+Execute:
+```
+examples/cpp/multithread_mandelbrot.sh
+```
+Then you should see a new file under `examples/output`.
+
+### Creating a simple mandelbrot using no high level model entities (fractfunc, workers, pointfunc)
+In this example we use the compiled formula directly to calculate the fractal with no postprocessing (antialiasing) or improvements (ie. autodeepen)
+Execute:
+```
+examples/cpp/raw_mandelbrot.sh
+```
+Then you should see a new file under `examples/output`.

examples/cpp/CMakeLists.txt

@@ -0,0 +1,46 @@
+cmake_minimum_required(VERSION 3.10)
+project(simple_mandelbrot)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(${PROJECT_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/model)
+
+FILE(GLOB MODELFILES ${PROJECT_SOURCE_DIR}/model/*.cpp)
+
+# MAIN
+
+add_executable(example main.cpp ${MODELFILES})
+
+find_package(PNG REQUIRED)
+include_directories(${PNG_INCLUDE_DIR})
+target_link_libraries(example ${PNG_LIBRARY})
+
+find_package(JPEG REQUIRED)
+include_directories(${JPEG_INCLUDE_DIR})
+target_link_libraries(example ${JPEG_LIBRARY})
+
+find_package(Threads REQUIRED)
+target_link_libraries(example ${CMAKE_THREAD_LIBS_INIT})
+
+target_link_libraries(example ${CMAKE_DL_LIBS})
+
+add_definitions(-DTHREADS -D_REENTRANT -DPNG_ENABLED -DJPG_ENABLED)
+
+# FRACT_STDLIB
+
+add_library(fract_stdlib SHARED
+    ${PROJECT_SOURCE_DIR}/fract_stdlib.cpp
+    ${PROJECT_SOURCE_DIR}/model/colorutils.cpp
+    ${PROJECT_SOURCE_DIR}/model/colormap.cpp
+    ${PROJECT_SOURCE_DIR}/model/image.cpp)
+
+set_target_properties(fract_stdlib PROPERTIES PREFIX "")
+set_target_properties(fract_stdlib PROPERTIES SUFFIX ".so")
+
+# FORMULA LIB
+
+add_library(formula SHARED
+    ${PROJECT_SOURCE_DIR}/formula.c)
+set_target_properties(formula PROPERTIES SUFFIX ".so")
+set_target_properties(formula PROPERTIES PREFIX "")

examples/cpp/Dockerfile

@@ -0,0 +1,22 @@
+FROM ubuntu:18.04
+
+ENV TZ=Europe/Minsk
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+	apt-get install -y build-essential git cmake autoconf libtool pkg-config libpng-dev libjpeg-dev
+
+WORKDIR /src
+
+ARG main_source
+ARG formula_source
+
+COPY examples/cpp/${main_source} ./main.cpp
+COPY examples/cpp/CMakeLists.txt ./
+COPY fract4d/c/fract_stdlib.cpp fract4d/c/fract_stdlib.h fract4d/c/pf.h  ./
+COPY fract4d/c/model/ ./model
+COPY ${formula_source} ./formula.c
+
+RUN cmake . && make
+
+CMD ["./example"]