From c4672e407716741ad2e8136d5c869d11363d2587 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R." Date: Mon, 2 Oct 2023 15:22:28 -0600 Subject: [PATCH 1/2] Fixed typo mvmv6 -> mvmf6 --- QModelViewer/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/QModelViewer/mainwindow.cpp b/QModelViewer/mainwindow.cpp index 2effa0b..0909b27 100644 --- a/QModelViewer/mainwindow.cpp +++ b/QModelViewer/mainwindow.cpp @@ -75,19 +75,19 @@ void MainWindow::createActions() //const QIcon newIcon = QIcon::fromTheme("document-new", QIcon(":/images/new.png")); newAct = new QAction(/* newIcon, */ tr("&New..."), this); newAct->setShortcuts(QKeySequence::New); - newAct->setStatusTip(tr("Create a new mvmv6 file")); + newAct->setStatusTip(tr("Create a new mvmf6 file")); connect(newAct, &QAction::triggered, this, &MainWindow::onFileNew); // File->Open... openAct = new QAction(tr("&Open..."), this); openAct->setShortcuts(QKeySequence::Open); - openAct->setStatusTip(tr("Open an existing mvmv6 file")); + openAct->setStatusTip(tr("Open an existing mvmf6 file")); connect(openAct, &QAction::triggered, this, &MainWindow::onFileOpen); // File->Close closeAct = new QAction(tr("&Close"), this); closeAct->setShortcuts(QKeySequence::Close); - closeAct->setStatusTip(tr("Close the current mvmv6 file")); + closeAct->setStatusTip(tr("Close the current mvmf6 file")); connect(closeAct, &QAction::triggered, this, &MainWindow::onFileClose); // File->Save From 4318017571e7550d6937557d9e60560ffd1def79 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R." Date: Mon, 2 Oct 2023 15:27:50 -0600 Subject: [PATCH 2/2] Closes MODFLOW-USGS/modelviewer-mf6#91 --- mv/mvModelFeatures.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mv/mvModelFeatures.cpp b/mv/mvModelFeatures.cpp index 7ea9af3..e61a7eb 100644 --- a/mv/mvModelFeatures.cpp +++ b/mv/mvModelFeatures.cpp @@ -622,7 +622,7 @@ void mvModelFeatures::Update() m_UnstructuredGrid->SetPoints(m_GridPoints); m_UnstructuredGrid->Modified(); } - else + else if (m_StructuredGrid) { m_StructuredGrid->SetDimensions(m_Dim[0], m_Dim[1], m_Dim[2]); m_StructuredGrid->SetPoints(m_GridPoints);