Skip to content
Snippets Groups Projects
Commit 95918c28 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

simplify python panel initialization

parent fcc3ec47
No related branches found
No related tags found
1 merge request!276Simplify script panel
......@@ -31,10 +31,10 @@ namespace {
const int accumulate_updates_during_msec = 20.;
}
PySampleWidget::PySampleWidget(QWidget* parent)
PySampleWidget::PySampleWidget(SampleModel* sampleModel, QWidget* parent)
: QWidget(parent)
, m_textEdit(new QTextEdit)
, m_sampleModel(nullptr)
, m_sampleModel(sampleModel)
, m_highlighter(nullptr)
, m_updateTimer(new UpdateTimer(accumulate_updates_during_msec, this))
, m_warningSign(new WarningSign(m_textEdit))
......@@ -53,15 +53,6 @@ PySampleWidget::PySampleWidget(QWidget* parent)
m_textEdit->setFontPointSize(DesignerHelper::getPythonEditorFontSize());
}
void PySampleWidget::setSampleModel(SampleModel* sampleModel)
{
if (sampleModel != m_sampleModel) {
if (m_sampleModel)
setEditorConnected(false);
m_sampleModel = sampleModel;
}
}
//! Update the editor with the script content
void PySampleWidget::updateEditor()
{
......@@ -72,7 +63,7 @@ void PySampleWidget::updateEditor()
const int old_scrollbar_value = m_textEdit->verticalScrollBar()->value();
QString code_snippet = generateCodeSnippet();
const QString code_snippet = generateCodeSnippet();
if (!code_snippet.isEmpty())
m_textEdit->setText(code_snippet);
......
......@@ -32,9 +32,7 @@ class QHideEvent;
class PySampleWidget : public QWidget {
public:
PySampleWidget(QWidget* parent = nullptr);
void setSampleModel(SampleModel* sampleModel);
PySampleWidget(SampleModel* sampleModel, QWidget* parent);
protected:
void showEvent(QShowEvent*);
......
......@@ -18,8 +18,8 @@
#include <QResizeEvent>
#include <QStackedWidget>
ScriptPanel::ScriptPanel(QWidget* parent)
: InfoPanel(parent), m_pySampleWidget(new PySampleWidget(this))
ScriptPanel::ScriptPanel(SampleModel* sampleModel, QWidget* parent)
: InfoPanel(parent), m_pySampleWidget(new PySampleWidget(sampleModel, this))
{
setWindowTitle("Python Script");
setObjectName("ScriptPanel");
......@@ -29,8 +29,3 @@ ScriptPanel::ScriptPanel(QWidget* parent)
setContentVisible(false);
m_toolBar->hide();
}
void ScriptPanel::setSampleModel(SampleModel* sampleModel)
{
m_pySampleWidget->setSampleModel(sampleModel);
}
......@@ -27,9 +27,7 @@ class ScriptPanel : public InfoPanel {
Q_OBJECT
public:
explicit ScriptPanel(QWidget* parent = nullptr);
void setSampleModel(SampleModel* sampleModel);
explicit ScriptPanel(SampleModel* sampleModel, QWidget* parent);
private:
PySampleWidget* m_pySampleWidget;
......
......@@ -66,7 +66,7 @@ void SampleView::createSubWindows()
m_toolBox = new SampleToolBox(this);
m_treeWidget = new SampleTreeWidget(this, models()->sampleModel());
m_propertyWidget = new SamplePropertyWidget(m_treeWidget->treeView()->selectionModel(), this);
m_scriptPanel = new ScriptPanel(this);
m_scriptPanel = new ScriptPanel(models()->sampleModel(), this);
m_realSpacePanel = new RealSpacePanel(models()->sampleModel(),
m_treeWidget->treeView()->selectionModel(), this);
......@@ -79,8 +79,6 @@ void SampleView::createSubWindows()
connect(m_scriptPanel, &ScriptPanel::widgetHeightRequest, m_docks,
&DocksController::setDockHeightForWidget);
m_scriptPanel->setSampleModel(models()->sampleModel());
m_sampleDesigner->setModels(models());
m_sampleDesigner->setSelectionModel(
m_treeWidget->treeView()->selectionModel(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment