Skip to content

Commit d492bbc

Browse files
elpasoelpaso
committedAug 8, 2018
[opencl] Make opencl info copyable
·
ltr-3_40final-3_4_0
1 parent ed7e831 commit d492bbc

File tree

2 files changed

+37
-33
lines changed

2 files changed

+37
-33
lines changed
 

‎src/app/qgsoptions.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
10951095
// Info updater
10961096
std::function<void( int )> infoUpdater = [ = ]( int )
10971097
{
1098-
mGPUInfoLabel->setText( QgsOpenClUtils::deviceDescription( mOpenClDevicesCombo->currentData().toString() ) );
1098+
mGPUInfoTextBrowser->setText( QgsOpenClUtils::deviceDescription( mOpenClDevicesCombo->currentData().toString() ) );
10991099
};
11001100
connect( mOpenClDevicesCombo, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), infoUpdater );
11011101
mOpenClDevicesCombo->setCurrentIndex( mOpenClDevicesCombo->findData( QgsOpenClUtils::deviceId( QgsOpenClUtils::activeDevice() ) ) );
@@ -1104,9 +1104,9 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
11041104
else
11051105
{
11061106
mGPUEnableCheckBox->setEnabled( false );
1107-
mGPUInfoLabel->setText( QStringLiteral( "OpenCL compatible GPU was not found on your system.<br>"
1108-
"You may need to install additional libraries in order to enable OpenCL.<br>"
1109-
"Please check your logs for further details." ) );
1107+
mGPUInfoTextBrowser->setText( QStringLiteral( "An OpenCL compatible device was not found on your system.<br>"
1108+
"You may need to install additional libraries in order to enable OpenCL.<br>"
1109+
"Please check your logs for further details." ) );
11101110
}
11111111

11121112

‎src/ui/qgsoptionsbase.ui

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
</item>
290290
<item>
291291
<property name="text">
292-
<string>GPU</string>
292+
<string>Acceleration</string>
293293
</property>
294294
<property name="toolTip">
295295
<string>Configure GPU for processing algorithms</string>
@@ -361,8 +361,8 @@
361361
<rect>
362362
<x>0</x>
363363
<y>0</y>
364-
<width>572</width>
365-
<height>833</height>
364+
<width>556</width>
365+
<height>885</height>
366366
</rect>
367367
</property>
368368
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1082,8 +1082,8 @@
10821082
<rect>
10831083
<x>0</x>
10841084
<y>0</y>
1085-
<width>561</width>
1086-
<height>1079</height>
1085+
<width>544</width>
1086+
<height>1096</height>
10871087
</rect>
10881088
</property>
10891089
<layout class="QVBoxLayout" name="verticalLayout_22">
@@ -1618,8 +1618,8 @@
16181618
<rect>
16191619
<x>0</x>
16201620
<y>0</y>
1621-
<width>576</width>
1622-
<height>351</height>
1621+
<width>556</width>
1622+
<height>369</height>
16231623
</rect>
16241624
</property>
16251625
<layout class="QGridLayout" name="gridLayout_15">
@@ -1785,8 +1785,8 @@
17851785
<rect>
17861786
<x>0</x>
17871787
<y>0</y>
1788-
<width>511</width>
1789-
<height>719</height>
1788+
<width>496</width>
1789+
<height>753</height>
17901790
</rect>
17911791
</property>
17921792
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -2153,8 +2153,8 @@
21532153
<rect>
21542154
<x>0</x>
21552155
<y>0</y>
2156-
<width>692</width>
2157-
<height>994</height>
2156+
<width>675</width>
2157+
<height>1052</height>
21582158
</rect>
21592159
</property>
21602160
<layout class="QGridLayout" name="gridLayout_22">
@@ -2904,8 +2904,8 @@
29042904
<rect>
29052905
<x>0</x>
29062906
<y>0</y>
2907-
<width>514</width>
2908-
<height>300</height>
2907+
<width>507</width>
2908+
<height>314</height>
29092909
</rect>
29102910
</property>
29112911
<layout class="QVBoxLayout" name="verticalLayout_25">
@@ -3215,8 +3215,8 @@
32153215
<rect>
32163216
<x>0</x>
32173217
<y>0</y>
3218-
<width>625</width>
3219-
<height>602</height>
3218+
<width>613</width>
3219+
<height>646</height>
32203220
</rect>
32213221
</property>
32223222
<layout class="QVBoxLayout" name="verticalLayout_30">
@@ -3659,8 +3659,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
36593659
<rect>
36603660
<x>0</x>
36613661
<y>0</y>
3662-
<width>156</width>
3663-
<height>267</height>
3662+
<width>154</width>
3663+
<height>271</height>
36643664
</rect>
36653665
</property>
36663666
<layout class="QHBoxLayout" name="horizontalLayout_46">
@@ -3827,8 +3827,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
38273827
<rect>
38283828
<x>0</x>
38293829
<y>0</y>
3830-
<width>556</width>
3831-
<height>825</height>
3830+
<width>547</width>
3831+
<height>873</height>
38323832
</rect>
38333833
</property>
38343834
<layout class="QVBoxLayout" name="verticalLayout_31">
@@ -4429,8 +4429,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
44294429
<rect>
44304430
<x>0</x>
44314431
<y>0</y>
4432-
<width>487</width>
4433-
<height>588</height>
4432+
<width>474</width>
4433+
<height>606</height>
44344434
</rect>
44354435
</property>
44364436
<layout class="QVBoxLayout" name="verticalLayout_39">
@@ -4698,8 +4698,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
46984698
<rect>
46994699
<x>0</x>
47004700
<y>0</y>
4701-
<width>427</width>
4702-
<height>380</height>
4701+
<width>415</width>
4702+
<height>392</height>
47034703
</rect>
47044704
</property>
47054705
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -4867,8 +4867,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
48674867
<rect>
48684868
<x>0</x>
48694869
<y>0</y>
4870-
<width>857</width>
4871-
<height>830</height>
4870+
<width>616</width>
4871+
<height>737</height>
48724872
</rect>
48734873
</property>
48744874
<layout class="QVBoxLayout" name="verticalLayout_33">
@@ -5324,7 +5324,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
53245324
<item>
53255325
<widget class="QLabel" name="label_53">
53265326
<property name="text">
5327-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Some of the internal C++ processing core algorithms and renderers can take advantage of an OpenCL compatible device to increase the performances.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;QGIS support is highly experimental and can crash QGIS because of bugs in the underlying libraries, enable at your own risk!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
5327+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Some of the internal C++ processing core algorithms and renderers can take advantage of an OpenCL compatible device to increase the performances.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;QGIS OpenCL support is highly experimental and can crash QGIS because of bugs in the underlying libraries, enable at your own risk!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
53285328
</property>
53295329
<property name="wordWrap">
53305330
<bool>true</bool>
@@ -5342,9 +5342,13 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
53425342
<widget class="QComboBox" name="mOpenClDevicesCombo"/>
53435343
</item>
53445344
<item>
5345-
<widget class="QLabel" name="mGPUInfoLabel">
5346-
<property name="text">
5347-
<string>Placemark for OpenCL information results (mGPUInfoLabel)</string>
5345+
<widget class="QTextBrowser" name="mGPUInfoTextBrowser">
5346+
<property name="html">
5347+
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
5348+
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
5349+
p, li { white-space: pre-wrap; }
5350+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
5351+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Placemark for OpenCL information results (mGPUInfoTextBrowser)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
53485352
</property>
53495353
</widget>
53505354
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.