datalogger: fixed warning messages

Signed-off-by: Ionut Muthi <[email protected]>
analogdevicesinc · Jun 28, 2024 · 969d7a8 · 969d7a8
1 parent 2f19008
commit 969d7a8
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 25 deletions.
diff --git a/plugins/datalogger/src/datamonitor/sevensegmentdisplay.cpp b/plugins/datalogger/src/datamonitor/sevensegmentdisplay.cpp
@@ -14,14 +14,14 @@ SevenSegmentDisplay::SevenSegmentDisplay(QWidget *parent)
 	mainLayout->setSpacing(10);
 	setLayout(mainLayout);
 
-	QWidget *mainContainer = new QWidget(this);
-	QVBoxLayout *mainContainerLayout = new QVBoxLayout(this);
+	QWidget *mainContainer = new QWidget();
+	QVBoxLayout *mainContainerLayout = new QVBoxLayout();
 	mainContainerLayout->setMargin(0);
 	mainContainerLayout->setSpacing(10);
 	mainContainer->setLayout(mainContainerLayout);
 
 	QWidget *widgetBody = new QWidget(this);
-	layout = new QVBoxLayout(this);
+	layout = new QVBoxLayout();
 	layout->setMargin(0);
 	layout->setSpacing(10);
 	widgetBody->setLayout(layout);

diff --git a/plugins/datalogger/src/dmm.cpp b/plugins/datalogger/src/dmm.cpp
@@ -28,11 +28,14 @@ QList<DmmDataMonitorModel *> DMM::getDmmMonitors(iio_context *ctx)
 				QString name = QString::fromStdString(iio_device_get_name(dev)) + ":" +
 					QString::fromStdString(iio_channel_get_id(chn));
 
-				DmmDataMonitorModel *channelModel =
-					new DmmDataMonitorModel(name, StyleHelper::getColor("CH" + QString::number(j)));
+				UnitOfMeasurement *unitOfMeasurement = new UnitOfMeasurement("", "");
+				DMMReadStrategy *dmmReadStrategy = new DMMReadStrategy(dev, chn);
 
-				channelModel->setIioChannel(chn);
-				channelModel->setIioDevice(dev);
+				if(iioChannelHasAttribute(chn, "offset")) {
+					double offset = 0;
+					iio_channel_attr_read_double(chn, "offset", &offset);
+					dmmReadStrategy->setOffset(offset);
+				}
 
 				int type = iio_channel_get_type(chn);
 				if(type != iio_chan_type::IIO_CHAN_TYPE_UNKNOWN) {
@@ -41,21 +44,16 @@ QList<DmmDataMonitorModel *> DMM::getDmmMonitors(iio_context *ctx)
 					if(isHwmon(dev, chn)) {
 						dmmInfo = m_hwmonDevices.value(static_cast<hwmon_chan_type>(type));
 					}
-
-					channelModel->setUnitOfMeasure(
-						new UnitOfMeasurement(dmmInfo.name, dmmInfo.symbol));
-
-					DMMReadStrategy *dmmReadStrategy = new DMMReadStrategy(dev, chn);
+					unitOfMeasurement = new UnitOfMeasurement(dmmInfo.name, dmmInfo.symbol);
 					dmmReadStrategy->setUmScale(dmmInfo.scale);
-					channelModel->setReadStrategy(dmmReadStrategy);
+				}
 
-					if(iioChannelHasAttribute(chn, "offset")) {
-						double offset = 0;
-						iio_channel_attr_read_double(chn, "offset", &offset);
+				DmmDataMonitorModel *channelModel =
+					new DmmDataMonitorModel(name, StyleHelper::getColor("CH" + QString::number(j)),
+								unitOfMeasurement, dmmReadStrategy);
 
-						dmmReadStrategy->setOffset(offset);
-					}
-				}
+				channelModel->setIioChannel(chn);
+				channelModel->setIioDevice(dev);
 
 				result.push_back(channelModel);
 			}

diff --git a/plugins/datalogger/src/menus/channelattributesmenu.cpp b/plugins/datalogger/src/menus/channelattributesmenu.cpp
@@ -23,8 +23,6 @@ ChannelAttributesMenu::ChannelAttributesMenu(DataMonitorModel *model, QWidget *p
 	layout->setSpacing(10);
 	settingsBody->setLayout(layout);
 
-	mainLayout->addLayout(layout);
-
 	QScrollArea *scrollArea = new QScrollArea(this);
 	scrollArea->setWidgetResizable(true);
 	scrollArea->setWidget(settingsBody);

diff --git a/plugins/datalogger/src/menus/datamonitorsettings.cpp b/plugins/datalogger/src/menus/datamonitorsettings.cpp
@@ -45,7 +45,7 @@ void DataMonitorSettings::init(QString title, QColor color)
 		[=, this]() { Q_EMIT titleUpdated(header->lineEdit()->text()); });
 
 	settingsBody = new QWidget(this);
-	layout = new QVBoxLayout(this);
+	layout = new QVBoxLayout();
 	layout->setMargin(0);
 	layout->setSpacing(10);
 	settingsBody->setLayout(layout);

diff --git a/plugins/datalogger/src/menus/monitorselectionmenu.cpp b/plugins/datalogger/src/menus/monitorselectionmenu.cpp
@@ -19,7 +19,7 @@ MonitorSelectionMenu::MonitorSelectionMenu(QMap<QString, DataMonitorModel *> *mo
 	setLayout(mainLayout);
 
 	QWidget *settingsBody = new QWidget(this);
-	layout = new QVBoxLayout(this);
+	layout = new QVBoxLayout();
 	layout->setMargin(0);
 	layout->setSpacing(10);
 	settingsBody->setLayout(layout);

diff --git a/plugins/datalogger/src/menus/plottimeaxiscontroller.cpp b/plugins/datalogger/src/menus/plottimeaxiscontroller.cpp
@@ -6,6 +6,7 @@
 #include <menuonoffswitch.h>
 #include <menusectionwidget.h>
 #include <timemanager.hpp>
+#include <cfloat>
 
 using namespace scopy;
 using namespace datamonitor;
@@ -43,7 +44,7 @@ PlotTimeAxisController::PlotTimeAxisController(MonitorPlot *m_plot, QWidget *par
 			{"min", 60},
 			{"hour", 3600},
 		},
-		"Delta", (double)((long)(-1 << 31)), (double)((long)1 << 31), false, false, xAxisContainer);
+		"Delta", -DBL_MAX, DBL_MAX, false, false, xAxisContainer);
 	m_xdelta->setValue(DataMonitorUtils::getAxisDefaultMaxValue());
 
 	auto &&timeTracker = TimeManager::GetInstance();

diff --git a/plugins/datalogger/src/menus/sevensegmentmonitorsettings.cpp b/plugins/datalogger/src/menus/sevensegmentmonitorsettings.cpp
@@ -24,7 +24,7 @@ SevenSegmentMonitorSettings::SevenSegmentMonitorSettings(QWidget *parent)
 	sevenSegmentSettingsContainer->contentLayout()->addWidget(sevenSegmentSettingsSection);
 	sevenSegmentSettingsSection->contentLayout()->setSpacing(10);
 
-	QHBoxLayout *precisionLayout = new QHBoxLayout(this);
+	QHBoxLayout *precisionLayout = new QHBoxLayout();
 
 	precision = new QLineEdit(sevenSegmentSettingsSection);
 	precision->setText(QString::number(DataMonitorUtils::getDefaultPrecision()));