SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@20 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2015-05-28 06:28:23 +00:00
parent 52316d9af5
commit 78db1b9717
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mbricks/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ if (NOT LIBPROJECT)
endif () endif ()
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
file(GLOB HDRS "*.h") file(GLOB HDRS "*.h")

7
mbricks/brick_math.cpp
View File

@@ -185,10 +185,13 @@ bool BrickMathFFT::tick_body(double time) {
buffer.resize(t, 0.); buffer.resize(t, 0.);
t = 0; t = 0;
} }
outputs[0] = o[t].real(); outputs[0] = (t >= 0 && t < o.size_s()) ? o[t].real() : 0.;
if (t >= v.size()) { if (t >= v.size()) {
t = 0; t = 0;
//fft(o.data(), log2((double)v.size()), parameters[1].toInt() > 0.); if (parameters[1].toInt() > 0.)
o = *fft.calcFFTinverse(v);
else
o = *fft.calcFFT(v);
for (uint i = 0; i < buffer.size(); ++i) for (uint i = 0; i < buffer.size(); ++i)
buffer[i] = abs(o[i]); buffer[i] = abs(o[i]);
} else { } else {

2
qad_graphic/graphic.h
View File

@@ -320,7 +320,7 @@ protected:
void setCurrentAction(GraphicAction action); void setCurrentAction(GraphicAction action);
void findGraphicsRect(double start_x = 0., double end_x = 0., double start_y = 0., double end_y = 0.); void findGraphicsRect(double start_x = 0., double end_x = 0., double start_y = 0., double end_y = 0.);
void tick(int index, bool slide = true, bool update = true); void tick(int index, bool slide = true, bool update = true);
void repaintCanvas(bool force = false) {if (tm.elapsed() < min_repaint_int && !force) return; tm.restart(); canvas->update();} void repaintCanvas(bool force = false) {if (tm.elapsed() < min_repaint_int && !force) return; tm.restart(); canvas->repaint();}
void drawGraphics(); void drawGraphics();
void drawGrid(); void drawGrid();
void drawGuides(); void drawGuides();