- fixed progress indicator

- cleaned up


git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@624 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2019-11-07 16:21:35 +00:00
parent 5d281ddca6
commit 4e21dd8114
5 changed files with 50 additions and 33 deletions
+3 -4
View File
@@ -185,7 +185,6 @@ void DrawComponent::drawAt(int x, int y, bool setColor)
double fy = (double)y / m_scaleY;
index = (int)(x/m_scaleX) + m_width*(int)(y/m_scaleY);
// mylog("Write(%d)\n", index);
if (index >= 0)
{
@@ -228,8 +227,7 @@ arma::mat& DrawComponent::getData ()
void DrawComponent::DrawData ()
{
double max = abs(m_data).max();
double max = arma::abs(m_data).max();
if (max < 1.0)
{
@@ -241,10 +239,11 @@ void DrawComponent::DrawData ()
{
for (int j=0; j < m_width; j++)
{
m_pG->setColour(Colour(Colours::white).greyLevel(m_offset + scale*m_data[i*m_width + j]));
m_pG->setColour(Colour(Colours::white).greyLevel(m_offset + scale*m_data(i*m_width + j)));
m_pG->fillRect(m_scaleX*j, m_scaleY*i, m_scaleX, m_scaleY);
}
}
repaint();
}