Skip to content

Commit a611566

Browse files
committed
Add disp params, remove scan plugin from loading, add libs to static build
1 parent dfb76b2 commit a611566

File tree

5 files changed

+26
-10
lines changed

5 files changed

+26
-10
lines changed

applications/mne_analyze/mne_analyze/mne_analyze.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ contains(MNECPP_CONFIG, static) {
8888
-lcontrolmanager \
8989
-lchannelselection \
9090
-lcoregistration \
91+
-ltimefrequency \
9192

9293
# Add Qt3D/Disp3D based plugins only if not building against WASM, which does not support Qt3D
9394
!contains(DEFINES, WASMBUILD) {

applications/mne_analyze/plugins/timefrequency/timefrequency.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
*
3333
*/
3434

35-
#ifndef TIMEFREQUENCY_H
36-
#define TIMEFREQUENCY_H
35+
#ifndef TIMEFREQUENCY_AN_PLUGIN_H
36+
#define TIMEFREQUENCY_AN_PLUGIN_H
3737

3838
//=============================================================================================================
3939
// INCLUDES

applications/mne_analyze/plugins/timefrequency/timefrequency.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ LIBS += -L$${MNE_LIBRARY_DIR}
6464
CONFIG(debug, debug|release) {
6565
LIBS += -lanSharedd \
6666
-lmnecppDispd \
67+
-lmnecppEventsd \
6768
-lmnecppConnectivityd \
6869
-lmnecppRtProcessingd \
6970
-lmnecppInversed \
@@ -75,6 +76,7 @@ CONFIG(debug, debug|release) {
7576
} else {
7677
LIBS += -lanShared \
7778
-lmnecppDisp \
79+
-lmnecppEvents \
7880
-lmnecppConnectivity \
7981
-lmnecppRtProcessing \
8082
-lmnecppInverse \

applications/mne_scan/plugins/plugins.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ SUBDIRS += \
7777
writetofile \
7878
hpi \
7979
rtfwd \
80-
timefrequency \
80+
#timefrequency \

libraries/disp/viewers/timefrequencyview.cpp

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,28 @@ void TimeFrequencyView::paintEvent(QPaintEvent *event)
170170

171171
//paint gradient bar
172172

173-
painter.save();
174-
painter.setPen(QPen(Qt::black, 1, Qt::SolidLine));
175-
QRect gradientBar(chartBound.topRight().x() + m_iChartBorderSpacing, chartBound.topRight().y(), m_iChartBorderSpacing, chartBound.height());
176-
painter.drawRect(gradientBar);
177-
painter.restore();
173+
// painter.save();
174+
// painter.setPen(QPen(Qt::black, 1, Qt::SolidLine));
175+
// QRect gradientBar(chartBound.topRight().x() + m_iChartBorderSpacing, chartBound.topRight().y(), m_iChartBorderSpacing, chartBound.height());
176+
// painter.drawRect(gradientBar);
177+
// painter.restore();
178+
179+
// painter.save();
180+
// painter.drawPixmap(gradientBar, m_CoefficientPixmap);
181+
// painter.restore();
182+
183+
// painter.save();
178184

185+
// painter.drawPixmap(chartBound.topRight().x() + m_iChartBorderSpacing, chartBound.topRight().y(), m_iChartBorderSpacing, chartBound.height(), m_CoefficientPixmap);
186+
187+
// painter.restore();
188+
189+
QLinearGradient linGrad(this->width() - m_iChartBorderSpacing * 1.5f, chartBound.topRight().y(), this->width() - m_iChartBorderSpacing * 1.5f, chartBound.bottomRight().y());
179190
painter.save();
180-
painter.drawPixmap(gradientBar, m_CoefficientPixmap);
181-
painter.restore();
191+
painter.setBrush(linGrad);
192+
painter.drawRect(chartBound.topRight().x() + m_iChartBorderSpacing, chartBound.topRight().y(), m_iChartBorderSpacing, chartBound.height());
193+
194+
182195

183196
//paint axis labels
184197
//test

0 commit comments

Comments
 (0)