pull/1/head
Darrell Anderson 12 years ago
parent 6e2ef2e265
commit de2b8d4c8b

@ -119,7 +119,7 @@ void WetPhysicsFilter::flow(KisPaintDeviceSP src, KisPaintDeviceSP /*dst*/, cons
WetPixDbl wet_mix, wet_tmp; WetPixDbl wet_mix, wet_tmp;
// XXX If the flow touches areas that have not been initialized with a height field yet, // XXX If the flow touches areas that have not been initialized with a height field yet,
// create a heigth field. // create a height field.
// We need three iterators, because we're working on a five-point convolution kernel (no corner pixels are being used) // We need three iterators, because we're working on a five-point convolution kernel (no corner pixels are being used)

@ -54,7 +54,7 @@ Define a pointer to a memory buffer with QUANTUMS
Create the buffer. Note that you cannot assume that there is one byte Create the buffer. Note that you cannot assume that there is one byte
per channel; QUANTUM can be bigger. per channel; QUANTUM can be bigger.
buf = new QUANTUM[width * heigth * depth * sizeof(QUANTUM)]; buf = new QUANTUM[width * height * depth * sizeof(QUANTUM)];
Fill the buf with the data. x1, y1, x2, y2 are the top left and bottom Fill the buf with the data. x1, y1, x2, y2 are the top left and bottom
right corner of the section you want. stride is the width of the right corner of the section you want. stride is the width of the

@ -42,8 +42,8 @@ KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& c
connect((TQObject*)comboBoxShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paramChanged())); connect((TQObject*)comboBoxShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paramChanged()));
spinBoxWidth->setMinValue(1); spinBoxWidth->setMinValue(1);
connect(spinBoxWidth,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxWidthChanged(int))); connect(spinBoxWidth,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxWidthChanged(int)));
spinBoxHeigth->setMinValue(1); spinBoxHeight->setMinValue(1);
connect(spinBoxHeigth,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHeigthChanged(int))); connect(spinBoxHeight,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHeightChanged(int)));
spinBoxHorizontal->setMinValue(0); spinBoxHorizontal->setMinValue(0);
connect(spinBoxHorizontal,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHorizontalChanged(int))); connect(spinBoxHorizontal,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHorizontalChanged(int)));
spinBoxVertical->setMinValue(0); spinBoxVertical->setMinValue(0);
@ -73,16 +73,16 @@ void KisAutobrush::activate()
void KisAutobrush::paramChanged() void KisAutobrush::paramChanged()
{ {
TQ_INT32 fh = TQMIN( spinBoxWidth->value()/2, spinBoxHorizontal->value() ) ; TQ_INT32 fh = TQMIN( spinBoxWidth->value()/2, spinBoxHorizontal->value() ) ;
TQ_INT32 fv = TQMIN( spinBoxHeigth->value()/2, spinBoxVertical->value() ); TQ_INT32 fv = TQMIN( spinBoxHeight->value()/2, spinBoxVertical->value() );
KisAutobrushShape* kas; KisAutobrushShape* kas;
if(comboBoxShape->currentItem() == 0) // use index compare instead of comparing a translatable string if(comboBoxShape->currentItem() == 0) // use index compare instead of comparing a translatable string
{ {
kas = new KisAutobrushCircleShape(spinBoxWidth->value(), spinBoxHeigth->value(), fh, fv); kas = new KisAutobrushCircleShape(spinBoxWidth->value(), spinBoxHeight->value(), fh, fv);
TQ_CHECK_PTR(kas); TQ_CHECK_PTR(kas);
} else { } else {
kas = new KisAutobrushRectShape(spinBoxWidth->value(), spinBoxHeigth->value(), fh, fv); kas = new KisAutobrushRectShape(spinBoxWidth->value(), spinBoxHeight->value(), fh, fv);
TQ_CHECK_PTR(kas); TQ_CHECK_PTR(kas);
} }
@ -119,12 +119,12 @@ void KisAutobrush::spinBoxWidthChanged(int a)
spinBoxHorizontal->setMaxValue(a/2); spinBoxHorizontal->setMaxValue(a/2);
if(m_linkSize) if(m_linkSize)
{ {
spinBoxHeigth->setValue(a); spinBoxHeight->setValue(a);
spinBoxVertical->setMaxValue(a/2); spinBoxVertical->setMaxValue(a/2);
} }
this->paramChanged(); this->paramChanged();
} }
void KisAutobrush::spinBoxHeigthChanged(int a) void KisAutobrush::spinBoxHeightChanged(int a)
{ {
spinBoxVertical->setMaxValue(a/2); spinBoxVertical->setMaxValue(a/2);
if(m_linkSize) if(m_linkSize)

@ -37,7 +37,7 @@ signals:
private slots: private slots:
void paramChanged(); void paramChanged();
void spinBoxWidthChanged(int ); void spinBoxWidthChanged(int );
void spinBoxHeigthChanged(int ); void spinBoxHeightChanged(int );
void spinBoxHorizontalChanged(int); void spinBoxHorizontalChanged(int);
void spinBoxVerticalChanged(int); void spinBoxVerticalChanged(int);
void linkSizeToggled(bool); void linkSizeToggled(bool);

@ -103,7 +103,7 @@
</widget> </widget>
<widget class="TQSpinBox" row="1" column="1"> <widget class="TQSpinBox" row="1" column="1">
<property name="name"> <property name="name">
<cstring>spinBoxHeigth</cstring> <cstring>spinBoxHeight</cstring>
</property> </property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>ClickFocus</enum> <enum>ClickFocus</enum>

@ -66,7 +66,7 @@ NOTE: Only Presentation Markup is considered here.
- movablelimits (mo) - movablelimits (mo)
- accent (mo) - accent (mo)
- width (mspace) - width (mspace)
- heigth (mspace) - height (mspace)
- depth (mspace) - depth (mspace)
- linebreak (mspace) - linebreak (mspace)
- lquote (ms) - lquote (ms)

Loading…
Cancel
Save