From 04d19b4d2a64072ae5adb88e87845d50b9c13a06 Mon Sep 17 00:00:00 2001 From: ela Date: Thu, 3 Mar 2011 18:09:11 +0000 Subject: [PATCH] 2011-03-03 Stefan Jahn * octave_window.cpp (startOctave): First implementation of GNU Octave connection to qucs. Thank you very much Michael! git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@1804 b5b04e8c-4942-46c9-ab4f-83783d557d1c --- NEWS | 3 +- qucs/ChangeLog | 5 ++ qucs/Makefile.am | 6 +- qucs/octave_window.cpp | 164 +++++++++++++++++++++++++++++++++++++++++ qucs/octave_window.h | 49 ++++++++++++ qucs/qucs.ap | 6 +- qucs/qucs.cpp | 47 +++++++++++- qucs/qucs.h | 9 ++- qucs/qucs_ar.ts | 29 ++++++++ qucs/qucs_ca.ts | 29 ++++++++ qucs/qucs_cs.ts | 29 ++++++++ qucs/qucs_de.ts | 29 ++++++++ qucs/qucs_es.ts | 29 ++++++++ qucs/qucs_fr.ts | 29 ++++++++ qucs/qucs_he.ts | 29 ++++++++ qucs/qucs_hu.ts | 29 ++++++++ qucs/qucs_init.cpp | 29 ++++++++ qucs/qucs_it.ts | 29 ++++++++ qucs/qucs_jp.ts | 29 ++++++++ qucs/qucs_kk.ts | 29 ++++++++ qucs/qucs_pl.ts | 29 ++++++++ qucs/qucs_pt.ts | 29 ++++++++ qucs/qucs_ro.ts | 29 ++++++++ qucs/qucs_ru.ts | 29 ++++++++ qucs/qucs_sv.ts | 29 ++++++++ qucs/qucs_tr.ts | 29 ++++++++ qucs/qucs_uk.ts | 29 ++++++++ qucs/qucsdoc.cpp | 3 + qucs/textdoc.cpp | 2 + 29 files changed, 832 insertions(+), 13 deletions(-) create mode 100644 qucs/octave_window.cpp create mode 100644 qucs/octave_window.h diff --git a/NEWS b/NEWS index 4c9d3b2a..c772e4b9 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ -- -- NEWS -- --- Copyright (C) 2003-2010 Stefan Jahn +-- Copyright (C) 2003-2011 Stefan Jahn -- -- This is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ files. Version 0.0.16 -------------- + * implementation of interactive GNU Octave connection * support for C++ code export of symbol drawings associated with Verilog-A files * direct association of symbol drawings to Verilog-HDL, Verilog-A diff --git a/qucs/ChangeLog b/qucs/ChangeLog index d5868a4c..c9e20f39 100644 --- a/qucs/ChangeLog +++ b/qucs/ChangeLog @@ -1,3 +1,8 @@ +2011-03-03 Stefan Jahn + + * octave_window.cpp (startOctave): First implementation of + GNU Octave connection to qucs. Thank you very much Michael! + 2011-03-01 Stefan Jahn * qucs.cpp (QucsApp): Fixed usage for "qucs " on command diff --git a/qucs/Makefile.am b/qucs/Makefile.am index 1fc731b1..b5db3091 100644 --- a/qucs/Makefile.am +++ b/qucs/Makefile.am @@ -4,7 +4,7 @@ # # Automake input file. # -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Stefan Jahn +# Copyright (C) 2004-2011 Stefan Jahn # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,13 +32,13 @@ endif bin_PROGRAMS = qucs -MOCHEADERS = qucs.h schematic.h textdoc.h +MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h MOCFILES = $(MOCHEADERS:.h=.moc.cpp) qucs_SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \ qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \ viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \ - schematic_file.cpp syntax.cpp module.cpp + schematic_file.cpp syntax.cpp module.cpp octave_window.cpp nodist_qucs_SOURCES = $(MOCFILES) diff --git a/qucs/octave_window.cpp b/qucs/octave_window.cpp new file mode 100644 index 00000000..0f771d20 --- /dev/null +++ b/qucs/octave_window.cpp @@ -0,0 +1,164 @@ +/*************************************************************************** + copyright : (C) 2010 by Michael Margraf + email : michael.margraf@alumni.tu-berlin.de + ***************************************************************************/ + +#include "octave_window.h" +#include "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +extern QDir QucsWorkDir; // current project path + +OctaveWindow::OctaveWindow(QDockWindow *parent_): QWidget(parent_, 0) +{ + vBox = new QVBoxLayout(this); + + output = new QTextEdit(this); + output->setReadOnly(true); + output->setUndoRedoEnabled(false); + output->setTextFormat(Qt::LogText); + output->setMaxLogLines(2000); + output->setWordWrap(QTextEdit::NoWrap); + output->setPaletteBackgroundColor(QucsSettings.BGColor); + vBox->addWidget(output, 10); + + input = new QLineEdit(this); + connect(input, SIGNAL(returnPressed()), SLOT(slotSendCommand())); + vBox->addWidget(input); + + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + parent_->setWidget(this); + parent_->setResizeEnabled(true); + parent_->setHorizontallyStretchable(true); + + histIterator = cmdHistory.end(); +} + +// ----------------------------------------------------------------- +OctaveWindow::~OctaveWindow() +{ + if(octProcess.isRunning()) + octProcess.kill(); +} + +// ----------------------------------------------------------------- +QSize OctaveWindow::sizeHint() +{ + QSize Size; + int w=0, h=0; + + Size = output->sizeHint(); + w = Size.width(); + h = Size.height() + input->sizeHint().height(); + return QSize(w, h); +} + +// ------------------------------------------------------------------------ +bool OctaveWindow::startOctave() +{ + if(octProcess.isRunning()) + return true; + + QStringList CommandLine; + CommandLine << "octave" << "--no-history" << "-i"; + octProcess.setArguments(CommandLine); + + disconnect(&octProcess, 0, 0, 0); + connect(&octProcess, SIGNAL(readyReadStderr()), SLOT(slotDisplayErr())); + connect(&octProcess, SIGNAL(readyReadStdout()), SLOT(slotDisplayMsg())); + connect(&octProcess, SIGNAL(processExited()), SLOT(slotOctaveEnded())); + + if(!octProcess.start()) { + output->setText(tr("ERROR: Cannot start Octave!")); + return false; + } + + output->clear(); + octProcess.writeToStdin("cd \"" + QucsWorkDir.absPath() + "\"\n"); + return true; +} + +// ------------------------------------------------------------------------ +void OctaveWindow::runOctaveScript(const QString& name) +{ + QFileInfo info(name); + int par = output->paragraphs() - 1; + int idx = output->paragraphLength(par); + output->insertAt(info.baseName(true) + "\n", par, idx); + + octProcess.writeToStdin(info.baseName(true) + "\n"); + output->scrollToBottom(); +} + +// ------------------------------------------------------------------------ +void OctaveWindow::slotSendCommand() +{ + int par = output->paragraphs() - 1; + int idx = output->paragraphLength(par); + output->insertAt(input->text() + "\n", par, idx); + output->scrollToBottom(); + + octProcess.writeToStdin(input->text() + "\n"); + if(!input->text().stripWhiteSpace().isEmpty()) + cmdHistory.append(input->text()); + histIterator = cmdHistory.end(); + input->clear(); +} + +// ------------------------------------------------------------------------ +void OctaveWindow::keyPressEvent(QKeyEvent *event) +{ + if(event->key() == Qt::Key_Up) { + if(histIterator == cmdHistory.begin()) + return; + histIterator--; + input->setText(*histIterator); + return; + } + + if(event->key() == Qt::Key_Down) { + if(histIterator == cmdHistory.end()) + return; + histIterator++; + input->setText(*histIterator); + return; + } +} + +// ------------------------------------------------------------------------ +// Is called when the process sends an output to stdout. +void OctaveWindow::slotDisplayMsg() +{ + int par = output->paragraphs() - 1; + int idx = output->paragraphLength(par); + output->insertAt(QString(octProcess.readStdout()), par, idx); + output->scrollToBottom(); +} + +// ------------------------------------------------------------------------ +// Is called when the process sends an output to stderr. +void OctaveWindow::slotDisplayErr() +{ + if(!isVisible()) + ((QDockWindow*)parent())->show(); // always show an error + + int par = output->paragraphs() - 1; + int idx = output->paragraphLength(par); + output->insertAt(QString(octProcess.readStderr()), par, idx); + output->scrollToBottom(); +} + +// ------------------------------------------------------------------------ +// Is called when the simulation process terminates. +void OctaveWindow::slotOctaveEnded() +{ + output->clear(); +} diff --git a/qucs/octave_window.h b/qucs/octave_window.h new file mode 100644 index 00000000..8d93110a --- /dev/null +++ b/qucs/octave_window.h @@ -0,0 +1,49 @@ +/*************************************************************************** + copyright : (C) 2010 by Michael Margraf + email : michael.margraf@alumni.tu-berlin.de + ***************************************************************************/ + +#ifndef OCTAVE_WINDOW_H +#define OCTAVE_WINDOW_H + +#include +#include +#include + +class QLineEdit; +class QTextEdit; +class QVBoxLayout; +class QDockWindow; + + +class OctaveWindow : public QWidget { + Q_OBJECT +public: + OctaveWindow(QDockWindow*); + ~OctaveWindow(); + + QSize sizeHint(); + bool startOctave(); + void runOctaveScript(const QString&); + +private slots: + void slotDisplayMsg(); + void slotDisplayErr(); + void slotOctaveEnded(); + void slotSendCommand(); + +protected: + void keyPressEvent(QKeyEvent*); + +private: + QVBoxLayout *vBox; + QTextEdit *output; + QLineEdit *input; + + QProcess octProcess; + + QStringList cmdHistory; + QStringList::Iterator histIterator; +}; + +#endif diff --git a/qucs/qucs.ap b/qucs/qucs.ap index ff2a2482..c3e74240 100644 --- a/qucs/qucs.ap +++ b/qucs/qucs.ap @@ -1,7 +1,7 @@ # # qucs/qucs.ap - Autodsp input file. # -# Copyright (C) 2005, 2006, 2009 Stefan Jahn +# Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,10 +27,10 @@ NAME = qucs SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \ qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \ viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \ - schematic_file.cpp syntax.cpp module.cpp + schematic_file.cpp syntax.cpp module.cpp octave_window.cpp # List of special Qt files. -MOCHEADERS = qucs.h schematic.h textdoc.h +MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h # Additional libraries. LIBS = -lcomponents -ldiagrams -lpaintings -ldialogs \ diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp index 687a9666..0222c27b 100644 --- a/qucs/qucs.cpp +++ b/qucs/qucs.cpp @@ -83,6 +83,7 @@ #include "dialogs/simmessage.h" #include "dialogs/vtabwidget.h" #include "dialogs/vtabbeddockwidget.h" +#include "octave_window.h" extern const char *empty_xpm[]; @@ -129,6 +130,7 @@ QucsApp::QucsApp() tr("VHDL Sources")+" (*.vhdl *.vhd);;"+ tr("Verilog Sources")+" (*.v);;"+ tr("Verilog-A Sources")+" (*.va);;"+ + tr("Octave Scripts")+" (*.m *.oct);;"+ tr("Any File")+" (*)"; QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs")); QucsHomeDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs")); @@ -144,6 +146,7 @@ QucsApp::QucsApp() viewToolBar->setOn(true); viewStatusBar->setOn(true); viewBrowseDock->setOn(true); + slotViewOctaveDock(false); initCursorMenu(); HierarchyHistory.setAutoDelete(true); Module::registerModules (); @@ -200,6 +203,7 @@ void QucsApp::initContentListView() ConOthers = new QListViewItem(Content, tr("Others")); ConDatasets = new QListViewItem(Content, tr("Datasets")); ConDisplays = new QListViewItem(Content, tr("Data Displays")); + ConOctave = new QListViewItem(Content, tr("Octave")); ConVerilog = new QListViewItem(Content, tr("Verilog")); ConVerilogA = new QListViewItem(Content, tr("Verilog-A")); ConSources = new QListViewItem(Content, tr("VHDL")); @@ -292,6 +296,14 @@ void QucsApp::initView() moveDockWindow(dock,DockLeft); TabView->setCurrentPage(0); + // ---------------------------------------------------------- + // Octave docking window + octDock = new QDockWindow(QDockWindow::InDock, this); + octDock->setCloseMode(QDockWindow::Always); + connect(octDock, SIGNAL(visibilityChanged(bool)), SLOT(slotToggleOctave(bool))); + octave = new OctaveWindow(octDock); + moveDockWindow(octDock, Qt::DockBottom); + // ............................................ readProjects(); // reads all projects and inserts them into the ListBox } @@ -755,6 +767,8 @@ void QucsApp::readProjectFiles() delete ConVerilogA->firstChild(); while(ConOthers->firstChild()) delete ConOthers->firstChild(); + while(ConOctave->firstChild()) + delete ConOctave->firstChild(); int n; // put all files into "Content"-ListView @@ -782,6 +796,8 @@ void QucsApp::readProjectFiles() new QListViewItem(ConVerilog, (*it).ascii()); else if(Str == "va") new QListViewItem(ConVerilogA, (*it).ascii()); + else if((Str == "m") || (Str == "oct")) + new QListViewItem(ConOctave, (*it).ascii()); else new QListViewItem(ConOthers, (*it).ascii()); } @@ -1188,6 +1204,8 @@ bool QucsApp::saveAs() Content->setSelected(new QListViewItem(ConVerilog, s), true); else if(ext == "va") Content->setSelected(new QListViewItem(ConVerilogA, s), true); + else if(ext == "m" || ext == "oct") + Content->setSelected(new QListViewItem(ConOctave, s), true); else Content->setSelected(new QListViewItem(ConOthers, s), true); } @@ -1662,8 +1680,8 @@ void QucsApp::slotSimulate() if(!saveAs()) return; // ... save schematic before // Perhaps the document was modified from another program ? + QFileInfo Info(Doc->DocName); if(Doc->lastSaved.isValid()) { - QFileInfo Info(Doc->DocName); if(Doc->lastSaved < Info.lastModified()) { int No = QMessageBox::warning(this, tr("Warning"), tr("The document was modified by another program !") + '\n' + @@ -1675,6 +1693,16 @@ void QucsApp::slotSimulate() } slotResetWarnings(); + + if(Info.extension(false) == "m" || Info.extension(false) == "oct") { + // It is an Octave script. + if(Doc->DocChanged) + Doc->save(); + slotViewOctaveDock(true); + octave->runOctaveScript(Doc->DocName); + return; + } + SimMessage *sim = new SimMessage(w, this); // disconnect is automatically performed, if one of the involved objects // is destroyed ! @@ -1714,7 +1742,13 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim) } else if(sim->SimOpenDpl) { // switch to data display - slotChangePage(sim->DocName, sim->DataDisplay); + if(sim->DataDisplay.right(2) == ".m" || + sim->DataDisplay.right(4) == ".oct") { // Is it an Octave script? + octave->startOctave(); + octave->runOctaveScript(sim->DataDisplay); + } + else + slotChangePage(sim->DocName, sim->DataDisplay); sim->slotClose(); // close and delete simulation window } else @@ -1808,7 +1842,11 @@ void QucsApp::slotToPage() return; } - slotChangePage(d->DocName, d->DataDisplay); + if(d->DocName.right(2) == ".m" || + d->DocName.right(4) == ".oct") + slotViewOctaveDock(true); + else + slotChangePage(d->DocName, d->DataDisplay); } // ------------------------------------------------------------------- @@ -1834,7 +1872,8 @@ void QucsApp::slotOpenContent(QListViewItem *item) QString Suffix = Info.extension(false); if (Suffix == "sch" || Suffix == "dpl" || Suffix == "vhdl" || - Suffix == "v" || Suffix == "va") { + Suffix == "v" || Suffix == "va" || + Suffix == "m" || Suffix == "oct") { gotoPage(Info.absFilePath()); if(item->text(1).isEmpty()) // is subcircuit ? diff --git a/qucs/qucs.h b/qucs/qucs.h index 6130c1e1..484f9005 100644 --- a/qucs/qucs.h +++ b/qucs/qucs.h @@ -43,6 +43,7 @@ class QIconView; class QIconViewItem; class VTabbedDockWidget; class VTabWidget; +class OctaveWindow; typedef bool (Schematic::*pToggleFunc) (); typedef void (MouseActions::*pMouseFunc) (Schematic*, QMouseEvent*); @@ -162,11 +163,13 @@ private: // ********* Widgets on the main area ********************************** VTabbedDockWidget *dock; VTabWidget *TabView; + QDockWindow *octDock; + OctaveWindow *octave; QListBox *Projects; QListView *Content; QListViewItem *ConSchematics, *ConSources, *ConDisplays, *ConDatasets, - *ConOthers, *ConVerilog, *ConVerilogA; + *ConOthers, *ConVerilog, *ConVerilogA, *ConOctave; QComboBox *CompChoose; @@ -209,6 +212,8 @@ private slots: void slotViewToolBar(bool toggle); // toggle the toolbar void slotViewStatusBar(bool toggle); // toggle the statusbar void slotViewBrowseDock(bool toggle); // toggle the dock window + void slotViewOctaveDock(bool); // toggle the dock window + void slotToggleOctave(bool); void slotToggleDock(bool); void slotHelpAbout(); // shows an about dialog void slotHelpAboutQt(); // shows the standard about dialog for Qt @@ -220,7 +225,7 @@ private: void initStatusBar(); // setup the statusbar QAction *helpAboutApp, *helpAboutQt, *viewToolBar, *viewStatusBar, - *viewBrowseDock; + *viewBrowseDock, *viewOctaveDock; // menus contain the items of their menubar QPopupMenu *fileMenu, *editMenu, *insMenu, *projMenu, *simMenu, *viewMenu, diff --git a/qucs/qucs_ar.ts b/qucs/qucs_ar.ts index f5d99365..e2163de9 100644 --- a/qucs/qucs_ar.ts +++ b/qucs/qucs_ar.ts @@ -1390,6 +1390,13 @@ but is %1 ! إلغاء + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9107,6 +9114,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_ca.ts b/qucs/qucs_ca.ts index 85a2e128..455d71dd 100644 --- a/qucs/qucs_ca.ts +++ b/qucs/qucs_ca.ts @@ -1526,6 +1526,13 @@ pero es %1! Cancel·lar + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9777,6 +9784,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_cs.ts b/qucs/qucs_cs.ts index 5979f0bf..d1e7aab5 100644 --- a/qucs/qucs_cs.ts +++ b/qucs/qucs_cs.ts @@ -1625,6 +1625,13 @@ je ale %1 ! Zrušit + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -10188,6 +10195,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_de.ts b/qucs/qucs_de.ts index 8a6c3f24..77b6c210 100644 --- a/qucs/qucs_de.ts +++ b/qucs/qucs_de.ts @@ -1633,6 +1633,13 @@ ist aber %1 ! Abbrechen + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -10262,6 +10269,28 @@ Konvertiert Datendatei in verschiedene Datenformate Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_es.ts b/qucs/qucs_es.ts index ac006ee0..86d9231b 100644 --- a/qucs/qucs_es.ts +++ b/qucs/qucs_es.ts @@ -1527,6 +1527,13 @@ pero es %1! Cancelar + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9829,6 +9836,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_fr.ts b/qucs/qucs_fr.ts index 765c9bf2..17bce23a 100644 --- a/qucs/qucs_fr.ts +++ b/qucs/qucs_fr.ts @@ -1521,6 +1521,13 @@ or elle vaut %1 ! Annuler + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9889,6 +9896,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_he.ts b/qucs/qucs_he.ts index cebeca0e..62aa1f93 100644 --- a/qucs/qucs_he.ts +++ b/qucs/qucs_he.ts @@ -1472,6 +1472,13 @@ but is %1 ! בטל + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9498,6 +9505,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_hu.ts b/qucs/qucs_hu.ts index 7aeb170b..874ab33b 100644 --- a/qucs/qucs_hu.ts +++ b/qucs/qucs_hu.ts @@ -1535,6 +1535,13 @@ de %1 ! Mégsem + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9867,6 +9874,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp index 8a042dcd..0bb9076f 100644 --- a/qucs/qucs_init.cpp +++ b/qucs/qucs_init.cpp @@ -32,6 +32,7 @@ #include "main.h" #include "qucs.h" #include "dialogs/vtabbeddockwidget.h" +#include "octave_window.h" // ---------------------------------------------------------- // initializes all QActions of the application @@ -609,6 +610,13 @@ void QucsApp::initActions() tr("Browse Window\n\nEnables/disables the browse dock window")); connect(viewBrowseDock, SIGNAL(toggled(bool)), SLOT(slotViewBrowseDock(bool))); + viewOctaveDock = new QAction(tr("&Octave Window"), 0, this, 0); + viewOctaveDock->setToggleAction(true); + viewOctaveDock->setStatusTip(tr("Shows/hides the Octave dock window")); + viewOctaveDock->setWhatsThis( + tr("Octave Window\n\nShows/hides the Octave dock window")); + connect(viewOctaveDock, SIGNAL(toggled(bool)), SLOT(slotViewOctaveDock(bool))); + helpIndex = new QAction("Help Index...", tr("Help Index..."), Key_F1, this); helpIndex->setStatusTip(tr("Index of Qucs Help")); helpIndex->setWhatsThis(tr("Help Index\n\nIndex of intern Qucs help")); @@ -740,6 +748,7 @@ void QucsApp::initMenuBar() viewToolBar->addTo(viewMenu); viewStatusBar->addTo(viewMenu); viewBrowseDock->addTo(viewMenu); + viewOctaveDock->addTo(viewMenu); helpMenu = new QPopupMenu(); // menuBar entry helpMenu helpIndex->addTo(helpMenu); @@ -909,6 +918,26 @@ void QucsApp::slotToggleDock(bool on) viewBrowseDock->blockSignals(false); } +// ---------------------------------------------------------- +// turn Octave Dock Window on or off +void QucsApp::slotViewOctaveDock(bool toggle) +{ + if(toggle) { + octDock->show(); + octave->startOctave(); + } + else + octDock->hide(); +} + +// ---------------------------------------------------------- +void QucsApp::slotToggleOctave(bool on) +{ + viewOctaveDock->blockSignals(true); + viewOctaveDock->setOn(on); + viewOctaveDock->blockSignals(false); +} + // ---------------------------------------------------------- void QucsApp::slotHelpAbout() { diff --git a/qucs/qucs_it.ts b/qucs/qucs_it.ts index a70e5ec9..74844488 100644 --- a/qucs/qucs_it.ts +++ b/qucs/qucs_it.ts @@ -1650,6 +1650,13 @@ ma è %1 ! Annulla + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -10239,6 +10246,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_jp.ts b/qucs/qucs_jp.ts index a3fecc86..c52a0c5e 100644 --- a/qucs/qucs_jp.ts +++ b/qucs/qucs_jp.ts @@ -1517,6 +1517,13 @@ but is %1 ! キャンセル + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9720,6 +9727,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_kk.ts b/qucs/qucs_kk.ts index a296866b..a48523a7 100644 --- a/qucs/qucs_kk.ts +++ b/qucs/qucs_kk.ts @@ -1369,6 +1369,13 @@ but is %1 ! Артқа қайтару + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9043,6 +9050,28 @@ Trolltech Qt жайлы Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_pl.ts b/qucs/qucs_pl.ts index c9de1aad..448bb8e2 100644 --- a/qucs/qucs_pl.ts +++ b/qucs/qucs_pl.ts @@ -1524,6 +1524,13 @@ a jest %1 ! Porzuć + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9872,6 +9879,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_pt.ts b/qucs/qucs_pt.ts index 9158d961..ecf47a5b 100644 --- a/qucs/qucs_pt.ts +++ b/qucs/qucs_pt.ts @@ -1457,6 +1457,13 @@ but is %1 ! Cancelar + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9000,6 +9007,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_ro.ts b/qucs/qucs_ro.ts index fd479f19..9c8b9bc0 100644 --- a/qucs/qucs_ro.ts +++ b/qucs/qucs_ro.ts @@ -1463,6 +1463,13 @@ but is %1 ! Revocare + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9588,6 +9595,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_ru.ts b/qucs/qucs_ru.ts index ede71421..84a6a210 100644 --- a/qucs/qucs_ru.ts +++ b/qucs/qucs_ru.ts @@ -1632,6 +1632,13 @@ but is %1 ! Отменить + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -10243,6 +10250,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_sv.ts b/qucs/qucs_sv.ts index 037ab9e7..64e5fcbd 100644 --- a/qucs/qucs_sv.ts +++ b/qucs/qucs_sv.ts @@ -1422,6 +1422,13 @@ men är nu %1 ! Avbryt + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9476,6 +9483,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_tr.ts b/qucs/qucs_tr.ts index a8d59587..7d56b1f9 100644 --- a/qucs/qucs_tr.ts +++ b/qucs/qucs_tr.ts @@ -1437,6 +1437,13 @@ olmalı fakat şu anda %1 ! İptal + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9582,6 +9589,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucs_uk.ts b/qucs/qucs_uk.ts index 1b5623cc..80382729 100644 --- a/qucs/qucs_uk.ts +++ b/qucs/qucs_uk.ts @@ -1429,6 +1429,13 @@ but is %1 ! Скасувати + + OctaveWindow + + ERROR: Cannot start Octave! + + + OptimizeDialog @@ -9691,6 +9698,28 @@ Convert data file to various file formats Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + QucsAttenuator diff --git a/qucs/qucsdoc.cpp b/qucs/qucsdoc.cpp index f5670b5f..63398773 100644 --- a/qucs/qucsdoc.cpp +++ b/qucs/qucsdoc.cpp @@ -79,6 +79,9 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_) QString base = Info.baseName(true); QString ext = Info.extension(false); + if(ext == "m" || ext == "oct") + SimTime = "1"; + DataSet = base + ".dat"; // name of the default dataset if(ext != "dpl") DataDisplay = base + ".dpl"; // name of default data display diff --git a/qucs/textdoc.cpp b/qucs/textdoc.cpp index 113880f6..e2b1390e 100644 --- a/qucs/textdoc.cpp +++ b/qucs/textdoc.cpp @@ -188,6 +188,8 @@ void TextDoc::setName (const QString& Name_) DataSet = Info.baseName (true) + ".dat"; DataDisplay = Info.baseName (true) + ".dpl"; + if(Info.extension(false) == "m" || Info.extension(false) == "oct") + SimTime = "1"; } // ---------------------------------------------------