Skip to content
Permalink
Browse files

Matching changes to allow Reveal in Finder/Explorer to work correctly

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
  • Loading branch information...
imikejackson committed Apr 13, 2019
1 parent b058392 commit 6a7b3511a429156cf2ee44c158c28bab978fd428
@@ -220,6 +220,7 @@ void EbsdMontageImportWidget::keyPressEvent(QKeyEvent* event)
m_Ui->inputDir->setText(m_CurrentText);
m_Ui->inputDir->setStyleSheet("");
m_Ui->inputDir->setToolTip("");
setValidFilePath(m_CurrentText);
}
}

@@ -277,6 +278,7 @@ void EbsdMontageImportWidget::getGuiParametersFromFilter()
EbsdMontageListInfo_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<EbsdMontageListInfo_t>();

m_Ui->inputDir->setText(data.InputPath);
setValidFilePath(data.InputPath);

m_Ui->rowStart->setValue(data.RowStart);
m_Ui->rowEnd->setValue(data.RowEnd);
@@ -304,6 +306,7 @@ void EbsdMontageImportWidget::inputDirBtn_clicked()
{
m_Ui->inputDir->blockSignals(true);
m_Ui->inputDir->setText(QDir::toNativeSeparators(outputFile));
setValidFilePath(data.InputPath);
inputDir_textChanged(m_Ui->inputDir->text());
SetOpenDialogLastFilePath(outputFile);
m_Ui->inputDir->blockSignals(false);
@@ -340,6 +343,8 @@ void EbsdMontageImportWidget::inputDir_textChanged(const QString& text)
updateFileListView();
m_Ui->inputDir->blockSignals(true);
m_Ui->inputDir->setText(QDir::toNativeSeparators(m_Ui->inputDir->text()));
setValidFilePath(data.InputPath);

m_Ui->inputDir->blockSignals(false);
}
else
@@ -474,6 +479,7 @@ void EbsdMontageImportWidget::afterPreflight()
void EbsdMontageImportWidget::setInputDirectory(const QString& val)
{
m_Ui->inputDir->setText(val);
setValidFilePath(val);
}

// -----------------------------------------------------------------------------
@@ -144,7 +144,6 @@ protected slots:
static QString m_OpenDialogLastFilePath;

QAction* m_ShowFileAction = nullptr;
QString m_CurrentlyValidPath = "";
QString m_CurrentText = "";
bool m_DidCausePreflight = false;
QPixmap m_Icon = QPixmap(QLatin1String(":/SIMPL/icons/images/caret-bottom.png"));
@@ -203,6 +203,7 @@ void EbsdToH5EbsdWidget::keyPressEvent(QKeyEvent* event)
{
m_LineEdit->setText(m_CurrentText);
m_LineEdit->setToolTip("");
setValidFilePath(m_LineEdit->text());
}
}

@@ -265,6 +266,8 @@ void EbsdToH5EbsdWidget::getGuiParametersFromFilter()
inputPath = QDir::homePath();
}
m_LineEdit->setText(inputPath);
setValidFilePath(m_LineEdit->text());

m_OutputFile->setText(m_Filter->getOutputFile());

QObjectList obs = children();
@@ -385,6 +388,7 @@ void EbsdToH5EbsdWidget::on_m_InputDirBtn_clicked()
{
m_LineEdit->blockSignals(true);
m_LineEdit->setText(QDir::toNativeSeparators(outputFile));
setValidFilePath(m_LineEdit->text());
on_m_LineEdit_textChanged(m_LineEdit->text());
setInputDirectory(outputFile);
m_LineEdit->blockSignals(false);
@@ -421,6 +425,7 @@ void EbsdToH5EbsdWidget::on_m_LineEdit_textChanged(const QString& text)
generateExampleEbsdInputFile();
m_LineEdit->blockSignals(true);
m_LineEdit->setText(QDir::toNativeSeparators(m_LineEdit->text()));
setValidFilePath(m_LineEdit->text());
m_LineEdit->blockSignals(false);
referenceFrameCheck->setText("Have you set the Reference Frame?");
}
@@ -896,6 +901,7 @@ QString EbsdToH5EbsdWidget::getOutputPath()
void EbsdToH5EbsdWidget::setInputDirectory(const QString &val)
{
m_LineEdit->setText(val);
setValidFilePath(m_LineEdit->text());
}

// -----------------------------------------------------------------------------
@@ -204,7 +204,6 @@ class EbsdToH5EbsdWidget : public FilterParameterWidget, private Ui::EbsdToH5Ebs
AxisAngleInput_t m_SampleTransformation;
AxisAngleInput_t m_EulerTransformation;
QAction* m_ShowFileAction = nullptr;
QString m_CurrentlyValidPath = "";
QString m_CurrentText = "";
bool m_DidCausePreflight = false;

@@ -176,6 +176,7 @@ void ReadH5EbsdWidget::setupGui()
}

m_LineEdit->setText(inputPath);
setValidFilePath(m_LineEdit->text());

// Update the widget when the data directory changes
SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
@@ -209,6 +210,8 @@ void ReadH5EbsdWidget::keyPressEvent(QKeyEvent* event)
if(event->key() == Qt::Key_Escape)
{
m_LineEdit->setText(m_CurrentText);
setValidFilePath(m_LineEdit->text());

m_LineEdit->setStyleSheet("");
m_LineEdit->setToolTip("");
}
@@ -313,6 +316,7 @@ void ReadH5EbsdWidget::on_m_LineEditBtn_clicked()
if(!inputFile.isNull())
{
m_LineEdit->setText(inputFile); // Should cause a signal to be emitted
setValidFilePath(m_LineEdit->text());
}
}

@@ -746,6 +750,7 @@ void ReadH5EbsdWidget::resetGuiFileInfoWidgets()
void ReadH5EbsdWidget::setInputFilePath(QString val)
{
m_LineEdit->setText(val);
setValidFilePath(m_LineEdit->text());
}

// -----------------------------------------------------------------------------
@@ -169,8 +169,7 @@ class ReadH5EbsdWidget : public FilterParameterWidget, private Ui::ReadH5EbsdWid
AxisAngleInput_t m_EulerTransformation;

QAction* m_ShowFileAction = nullptr;
QString m_CurrentlyValidPath = "";
QString m_CurrentText = "";
QString m_CurrentText = "";
bool m_DidCausePreflight = false;
bool m_NewFileLoaded;
bool m_Version4Warning;

0 comments on commit 6a7b351

Please sign in to comment.
You can’t perform that action at this time.