Skip to content

Commit 488f394

Browse files
Gustrynyalldawson
Gustry
authored and
nyalldawson
committed
add log, ln and != button in the raster calculator
1 parent 83f3a58 commit 488f394

File tree

3 files changed

+107
-81
lines changed

3 files changed

+107
-81
lines changed

‎src/app/qgsrastercalcdialog.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,21 @@ void QgsRasterCalcDialog::on_mATanButton_clicked()
386386
mExpressionTextEdit->insertPlainText( " atan ( " );
387387
}
388388

389+
void QgsRasterCalcDialog::on_mLnButton_clicked()
390+
{
391+
mExpressionTextEdit->insertPlainText( " ln ( " );
392+
}
393+
394+
void QgsRasterCalcDialog::on_mLogButton_clicked()
395+
{
396+
mExpressionTextEdit->insertPlainText( " log10 ( " );
397+
}
398+
399+
void QgsRasterCalcDialog::on_mNotEqualButton_clicked()
400+
{
401+
mExpressionTextEdit->insertPlainText( " != " );
402+
}
403+
389404
void QgsRasterCalcDialog::on_mOpenBracketPushButton_clicked()
390405
{
391406
mExpressionTextEdit->insertPlainText( " ( " );

‎src/app/qgsrastercalcdialog.h

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcD
6464
void on_mSinButton_clicked();
6565
void on_mASinButton_clicked();
6666
void on_mExpButton_clicked();
67+
void on_mLnButton_clicked();
68+
void on_mLogButton_clicked();
69+
void on_mNotEqualButton_clicked();
6770
void on_mTanButton_clicked();
6871
void on_mACosButton_clicked();
6972
void on_mATanButton_clicked();

‎src/ui/qgsrastercalcdialogbase.ui

+89-81
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>677</width>
10-
<height>589</height>
10+
<height>637</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -243,7 +243,7 @@
243243
</widget>
244244
</item>
245245
<item row="4" column="1" colspan="3">
246-
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
246+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector">
247247
<property name="focusPolicy">
248248
<enum>Qt::StrongFocus</enum>
249249
</property>
@@ -282,38 +282,45 @@
282282
<property name="bottomMargin">
283283
<number>0</number>
284284
</property>
285-
<item row="1" column="3">
285+
<item row="1" column="6">
286286
<widget class="QPushButton" name="mASinButton">
287287
<property name="text">
288288
<string>asin</string>
289289
</property>
290290
</widget>
291291
</item>
292-
<item row="0" column="1">
293-
<widget class="QPushButton" name="mMultiplyPushButton">
292+
<item row="0" column="4">
293+
<widget class="QPushButton" name="mCosButton">
294294
<property name="text">
295-
<string>*</string>
295+
<string>cos</string>
296+
</property>
297+
</widget>
298+
</item>
299+
<item row="2" column="4">
300+
<widget class="QPushButton" name="mNotEqualButton">
301+
<property name="text">
302+
<string>!=</string>
296303
</property>
297304
</widget>
298305
</item>
299306
<item row="2" column="6">
300-
<widget class="QPushButton" name="mOrButton">
307+
<widget class="QPushButton" name="mLesserEqualButton">
301308
<property name="text">
302-
<string>OR</string>
309+
<string>&lt;=</string>
303310
</property>
304311
</widget>
305312
</item>
306-
<item row="1" column="1">
307-
<widget class="QPushButton" name="mDividePushButton">
313+
<item row="0" column="6">
314+
<widget class="QPushButton" name="mSinButton">
308315
<property name="text">
309-
<string>/</string>
316+
<string>sin</string>
310317
</property>
311318
</widget>
312319
</item>
313-
<item row="1" column="0">
314-
<widget class="QPushButton" name="mMinusPushButton">
320+
<item row="1" column="8">
321+
<widget class="QPushButton" name="mATanButton">
315322
<property name="text">
316-
<string>-</string>
323+
<string>atan</string>
317324
</property>
318325
</widget>
319326
</item>
@@ -324,59 +331,65 @@
324331
</property>
325332
</widget>
326333
</item>
327-
<item row="0" column="6">
328-
<widget class="QPushButton" name="mOpenBracketPushButton">
334+
<item row="0" column="8">
335+
<widget class="QPushButton" name="mTanButton">
329336
<property name="text">
330-
<string>(</string>
337+
<string>tan</string>
331338
</property>
332339
</widget>
333340
</item>
334-
<item row="0" column="2">
335-
<widget class="QPushButton" name="mSqrtButton">
341+
<item row="1" column="4">
342+
<widget class="QPushButton" name="mACosButton">
336343
<property name="text">
337-
<string>sqrt</string>
344+
<string>acos</string>
338345
</property>
339346
</widget>
340347
</item>
341-
<item row="1" column="5">
342-
<widget class="QPushButton" name="mATanButton">
348+
<item row="2" column="10">
349+
<widget class="QPushButton" name="mAndButton">
343350
<property name="text">
344-
<string>atan</string>
351+
<string>AND</string>
345352
</property>
346353
</widget>
347354
</item>
348-
<item row="2" column="1">
349-
<widget class="QPushButton" name="mGreaterButton">
350-
<property name="text">
351-
<string>&gt;</string>
355+
<item row="0" column="14">
356+
<spacer name="horizontalSpacer_3">
357+
<property name="orientation">
358+
<enum>Qt::Horizontal</enum>
352359
</property>
353-
</widget>
360+
<property name="sizeHint" stdset="0">
361+
<size>
362+
<width>5</width>
363+
<height>20</height>
364+
</size>
365+
</property>
366+
</spacer>
354367
</item>
355-
<item row="1" column="2">
356-
<widget class="QPushButton" name="mCosButton">
368+
<item row="2" column="8">
369+
<widget class="QPushButton" name="mGreaterEqualButton">
357370
<property name="text">
358-
<string>cos</string>
371+
<string>&gt;=</string>
359372
</property>
360373
</widget>
361374
</item>
362-
<item row="2" column="5">
363-
<widget class="QPushButton" name="mAndButton">
375+
<item row="1" column="0">
376+
<widget class="QPushButton" name="mMinusPushButton">
364377
<property name="text">
365-
<string>AND</string>
378+
<string>-</string>
366379
</property>
367380
</widget>
368381
</item>
369-
<item row="0" column="4">
370-
<widget class="QPushButton" name="mExpButton">
382+
<item row="1" column="1">
383+
<widget class="QPushButton" name="mDividePushButton">
371384
<property name="text">
372-
<string>^</string>
385+
<string>/</string>
373386
</property>
374387
</widget>
375388
</item>
376-
<item row="2" column="3">
377-
<widget class="QPushButton" name="mLesserEqualButton">
389+
<item row="2" column="1">
390+
<widget class="QPushButton" name="mGreaterButton">
378391
<property name="text">
379-
<string>&lt;=</string>
392+
<string>&gt;</string>
380393
</property>
381394
</widget>
382395
</item>
@@ -387,60 +400,68 @@
387400
</property>
388401
</widget>
389402
</item>
390-
<item row="2" column="4">
391-
<widget class="QPushButton" name="mGreaterEqualButton">
403+
<item row="0" column="1">
404+
<widget class="QPushButton" name="mMultiplyPushButton">
392405
<property name="text">
393-
<string>&gt;=</string>
406+
<string>*</string>
394407
</property>
395408
</widget>
396409
</item>
397-
<item row="0" column="3">
398-
<widget class="QPushButton" name="mSinButton">
410+
<item row="0" column="0">
411+
<widget class="QPushButton" name="mPlusPushButton">
399412
<property name="text">
400-
<string>sin</string>
413+
<string>+</string>
401414
</property>
402415
</widget>
403416
</item>
404-
<item row="0" column="0">
405-
<widget class="QPushButton" name="mPlusPushButton">
417+
<item row="2" column="11">
418+
<widget class="QPushButton" name="mOrButton">
406419
<property name="text">
407-
<string>+</string>
420+
<string>OR</string>
408421
</property>
409422
</widget>
410423
</item>
411-
<item row="0" column="5">
412-
<widget class="QPushButton" name="mACosButton">
424+
<item row="0" column="10">
425+
<widget class="QPushButton" name="mLogButton">
413426
<property name="text">
414-
<string>acos</string>
427+
<string>log10</string>
415428
</property>
416429
</widget>
417430
</item>
418-
<item row="1" column="6">
431+
<item row="1" column="10">
432+
<widget class="QPushButton" name="mLnButton">
433+
<property name="text">
434+
<string>ln</string>
435+
</property>
436+
</widget>
437+
</item>
438+
<item row="0" column="11">
439+
<widget class="QPushButton" name="mOpenBracketPushButton">
440+
<property name="text">
441+
<string>(</string>
442+
</property>
443+
</widget>
444+
</item>
445+
<item row="1" column="11">
419446
<widget class="QPushButton" name="mCloseBracketPushButton">
420447
<property name="text">
421448
<string>)</string>
422449
</property>
423450
</widget>
424451
</item>
425-
<item row="1" column="4">
426-
<widget class="QPushButton" name="mTanButton">
452+
<item row="0" column="2">
453+
<widget class="QPushButton" name="mSqrtButton">
427454
<property name="text">
428-
<string>tan</string>
455+
<string>sqrt</string>
429456
</property>
430457
</widget>
431458
</item>
432-
<item row="0" column="7">
433-
<spacer name="horizontalSpacer_3">
434-
<property name="orientation">
435-
<enum>Qt::Horizontal</enum>
436-
</property>
437-
<property name="sizeHint" stdset="0">
438-
<size>
439-
<width>5</width>
440-
<height>20</height>
441-
</size>
459+
<item row="1" column="2">
460+
<widget class="QPushButton" name="mExpButton">
461+
<property name="text">
462+
<string>^</string>
442463
</property>
443-
</spacer>
464+
</widget>
444465
</item>
445466
</layout>
446467
</widget>
@@ -502,7 +523,7 @@
502523
<customwidget>
503524
<class>QgsProjectionSelectionWidget</class>
504525
<extends>QWidget</extends>
505-
<header location="global">qgsprojectionselectionwidget.h</header>
526+
<header>qgsprojectionselectionwidget.h</header>
506527
<container>1</container>
507528
</customwidget>
508529
</customwidgets>
@@ -520,25 +541,12 @@
520541
<tabstop>mAddResultToProjectCheckBox</tabstop>
521542
<tabstop>mPlusPushButton</tabstop>
522543
<tabstop>mMultiplyPushButton</tabstop>
523-
<tabstop>mSqrtButton</tabstop>
524-
<tabstop>mSinButton</tabstop>
525-
<tabstop>mExpButton</tabstop>
526-
<tabstop>mACosButton</tabstop>
527-
<tabstop>mOpenBracketPushButton</tabstop>
528544
<tabstop>mMinusPushButton</tabstop>
529545
<tabstop>mDividePushButton</tabstop>
530-
<tabstop>mCosButton</tabstop>
531-
<tabstop>mASinButton</tabstop>
532-
<tabstop>mTanButton</tabstop>
533-
<tabstop>mATanButton</tabstop>
534-
<tabstop>mCloseBracketPushButton</tabstop>
535546
<tabstop>mLessButton</tabstop>
536547
<tabstop>mGreaterButton</tabstop>
537-
<tabstop>mEqualButton</tabstop>
538-
<tabstop>mLesserEqualButton</tabstop>
539548
<tabstop>mGreaterEqualButton</tabstop>
540549
<tabstop>mAndButton</tabstop>
541-
<tabstop>mOrButton</tabstop>
542550
<tabstop>mExpressionTextEdit</tabstop>
543551
</tabstops>
544552
<resources/>

0 commit comments

Comments
 (0)