Hide Latex Source after evaluated, show only the output part

Author: arun3688

OMNotebook/OMNotebookGUI/cellcommands.cpp

@@ -433,17 +433,20 @@ namespace IAEX
 
       newLatexCell->setStyle( style );
       newLatexCell->setText( oldLatexCell->text() );
-
       if( oldLatexCell->isEvaluated() )
       {
-        newLatexCell->setEvaluated( true );
+        newLatexCell->setEvaluated(true);
         //newLatexCell->setTextOutput( oldLatexCell->textOutput() );
         newLatexCell->setTextOutputHtml(oldLatexCell->textOutputHtml());
+        newLatexCell->output_->show();
+        newLatexCell->latexButton->show();
       }
       else
-        newLatexCell->setEvaluated( false );
+       {
+        newLatexCell->setEvaluated(false);
+      }
+      //newLatexCell->setClosed( oldLatexCell->isClosed() );
 
-      newLatexCell->setClosed( oldLatexCell->isClosed() );
     }
 
     else if( typeid(TextCell) == typeid( *newCell ))

OMNotebook/OMNotebookGUI/celldocument.cpp

@@ -945,6 +945,7 @@ namespace IAEX
    */
   void CellDocument::mouseClickedOnCell(Cell *clickedCell)
   {
+
     // 2006-04-25, AF
     if( lastClickedCell_ == clickedCell )
       return;
@@ -978,7 +979,6 @@ namespace IAEX
 
     clickedCell->setReadOnly(false);
     clickedCell->setFocus(true);
-
     emit cursorChanged();
   }
 
@@ -1026,6 +1026,20 @@ namespace IAEX
       graphcell->setFocusOutput(true);
     }
 
+    else if(typeid(LatexCell) == typeid(*clickedCell))
+    {
+      LatexCell *latexcell = dynamic_cast<LatexCell*>(clickedCell);
+      latexcell->setReadOnly(false);
+      latexcell->setFocusOutput(true);
+     /* QString text=latexcell->textOutput();
+      if(!text.isEmpty())
+      {
+          latexcell->output_->hide();
+          latexcell->input_->show();
+          latexcell->hideButton->show();
+      } */
+    }
+
     else
     {
       clickedCell->setReadOnly(false);

OMNotebook/OMNotebookGUI/latexcell.cpp

@@ -105,12 +105,7 @@ namespace IAEX {
   };
 
 
-
   /*!
-  * \class MyTextEdit2
-  * \author Anders Ferström
-  * \date 2005-11-01
-  *
   * \brief Extends QTextEdit. Mostly so I can catch when a user
   * clicks on the editor
   */
@@ -183,7 +178,6 @@ namespace IAEX {
   */
   void MyTextEdit3::keyPressEvent(QKeyEvent *event )
   {
-    emit showVariableButton(false);
     // EVAL, key: SHIFT + RETURN || SHIFT + ENTER
     if( event->modifiers() == Qt::ShiftModifier &&
       (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) )
@@ -483,7 +477,7 @@ namespace IAEX {
     createLatexCell();
     createOutputCell();
 
-    connect(input_, SIGNAL(showVariableButton(bool)), this, SLOT(showVariableButton(bool)));
+    //connect(input_, SIGNAL(showVariableButton(bool)), this, SLOT(showVariableButton(bool)));
 
     //connect(output_, SIGNAL(anchorClicked(const QUrl&)), input_, SLOT(goToPos(const QUrl&)));
 
@@ -526,12 +520,13 @@ namespace IAEX {
   {
 
     input_ = new MyTextEdit3( mainWidget() );
-    variableButton = new QPushButton("D",input_);
-    variableButton->setToolTip("New simulation data available");
-    variableButton->setMaximumWidth(25);
+    hideButton = new QPushButton("H",input_);
+    hideButton->setToolTip("Hide the Latex Source");
+    hideButton->setMaximumWidth(25);
     layout_->addWidget( input_, 1, 1 );
-    layout_->addWidget(variableButton, 1, 2);
-    variableButton->hide();
+    layout_->addWidget(hideButton, 1, 2,Qt::AlignTop);
+
+    hideButton->hide();
     // 2006-03-02 AF, Add a chapter counter
     createChapterCounter();
 
@@ -551,18 +546,20 @@ namespace IAEX {
 
     input_->setPalette(palette);
 
-    variableButton->setPalette(palette);
+    hideButton->setPalette(palette);
     // is this needed, don't know /AF
     input_->installEventFilter(this);
-
-    connect( input_, SIGNAL( textChanged() ), this, SLOT( contentChanged() ));
+    connect(hideButton, SIGNAL(clicked()), this, SLOT(hidelatexsource()));
+    connect( input_, SIGNAL( textChanged() ), this, SLOT( contentChanged()));
     connect( input_, SIGNAL( clickOnCell() ), this, SLOT( clickEvent() ));
     connect( input_, SIGNAL( wheelMove(QWheelEvent*) ), this, SLOT( wheelEvent(QWheelEvent*) ));
     connect( input_, SIGNAL( eval() ), this, SLOT( eval() ));
     connect( input_, SIGNAL( command() ), this, SLOT( command() ));
     connect( input_, SIGNAL( nextCommand() ), this, SLOT( nextCommand() ));
     connect( input_, SIGNAL( nextField() ), this, SLOT( nextField() ));
-   // connect( input_, SIGNAL( textChanged() ), this, SLOT( addToHighlighter() ));
+    connect( input_, SIGNAL( nextField() ), this, SLOT( nextField() ));
+
+    // connect( input_, SIGNAL( textChanged() ), this, SLOT( addToHighlighter() ));
     connect( input_, SIGNAL( currentCharFormatChanged(const QTextCharFormat &) ),
       this, SLOT( charFormatChanged(const QTextCharFormat &) ));
     connect( input_, SIGNAL( forwardAction(int) ), this, SIGNAL( forwardAction(int) ));
@@ -574,13 +571,21 @@ namespace IAEX {
     connect(input_, SIGNAL(textChanged()), input_, SLOT(setModified()));
   }
 
-  void LatexCell::showVariableButton(bool b)
-  {
-    if(b)
-      variableButton->show();
-    else
-      variableButton->hide();
-  }
+ void LatexCell::hidelatexsource()
+ {
+     input_->hide();
+     hideButton->hide();
+     latexButton->show();
+     output_->show();
+ }
+
+ void LatexCell::showlatexsource()
+ {
+     output_->hide();
+     hideButton->show();
+     latexButton->hide();
+     input_->show();
+ }
 
   /*!
   * \brief Creates the QTextEdit for the output part of the
@@ -590,8 +595,12 @@ namespace IAEX {
   void LatexCell::createOutputCell()
   {
     output_ = new MyTextEdit3( mainWidget() );
-    layout_->addWidget( output_, 2, 1 );
-
+    layout_->addWidget( output_, 1, 1 );
+    latexButton = new QPushButton("L",output_);
+    latexButton->setToolTip("Show the Latex Source");
+    latexButton->setMaximumWidth(25);
+    layout_->addWidget( latexButton, 1, 2, Qt::AlignTop);
+    latexButton->hide();
     output_->setReadOnly( true );
 
     output_->setOpenLinks(false);
@@ -601,7 +610,7 @@ namespace IAEX {
 
     output_->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     output_->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-
+    connect(latexButton, SIGNAL(clicked()), this, SLOT(showlatexsource()));
     connect( output_, SIGNAL( textChanged() ), this, SLOT(contentChanged()));
     connect( output_, SIGNAL( clickOnCell() ), this, SLOT( clickEventOutput() ));
     connect( output_, SIGNAL( wheelMove(QWheelEvent*) ), this, SLOT( wheelEvent(QWheelEvent*) ));
@@ -1149,7 +1158,8 @@ void LatexCell::eval()
        *  4) Display the output as image to the output cell inorder to maintain the
        *     equations and formula structures
        */
-
+    //hideButton->hide();
+    //latexButton->show();
     input_->blockSignals(true);
     output_->blockSignals(true);
     output_->textCursor().insertText("");
@@ -1193,14 +1203,13 @@ void LatexCell::eval()
         /* Check for latex is installed */
         if (Latexversion.isEmpty())
         {
-            //qDebug()<< "Latex is not installed in your system";
-            output_->clear();
-            output_->textCursor().insertText("Error: Latex is not installed in your System");
-            setClosed(false);
+            QMessageBox::warning( 0, "Error", "Latex is not installed in your System, This cell cannot be evaluated", "OK" );
         }
         /*Generate the DVI file from tex through latex */
         if (!Latexversion.isEmpty())
         {
+            hideButton->hide();
+            latexButton->show();
             process->start("latex", QStringList() << "-halt-on-error" << Tex);
             process->waitForFinished();
             QFile logfile(log);
@@ -1244,30 +1253,35 @@ void LatexCell::eval()
                 QFileInfo checkpng(Png);
                 if(!checkpng.exists())
                 {
+                    output_->clear();
                     output_->textCursor().insertText("Error:Problem in finding dvipng executable");
                     setClosed(false);
+
                 }
                 else
                 {
                     output_->clear();
                     output_->textCursor().insertImage(Png);
-                    setClosed(false);
+                    //setClosed(false);
+                    input_->hide();
+                    output_->show();
+
                 }
             }
             else
             {
-                output_->clear();
-                output_->textCursor().insertText("Message:Maximum of 1 page document generation is supported per Latexcell, The script generates more than 1 page, Add a new Latex cell and create the document");
-                setClosed(false);
 
+                QMessageBox::warning( 0, "Warning", "Maximum of 1 page document generation is supported per Latexcell, The script generates more than 1 page", "OK" );
             }
         }
     }
     else
     {
         //qDebug()<< "Empty cells can't be evaluated";
+        hideButton->hide();
+        latexButton->show();
         output_->clear();
-        output_->textCursor().insertText("Message: Empty Cells cannot be Evaluated");
+        output_->textCursor().insertText("Message: Empty Latex Cells cannot be Evaluated");
         setClosed(false);
     }
     input_->blockSignals(false);

OMNotebook/OMNotebookGUI/latexcell.h

@@ -96,6 +96,8 @@ namespace IAEX
 
   public slots:
     void eval();
+    void hidelatexsource();
+    void showlatexsource();
     void command();
     void nextCommand();
     void nextField();
@@ -117,7 +119,7 @@ namespace IAEX
     virtual void setFocus(const bool focus);
     virtual void setFocusOutput(const bool focus);
     void setExpr(QString);
-    void showVariableButton(bool);
+    //void showVariableButton(bool);
     void setState(int state);
 
   protected:
@@ -149,7 +151,10 @@ namespace IAEX
     Document *document_;
 
   public:
-    QPushButton* variableButton;
+    //QPushButton* variableButton;
+    QPushButton* hideButton;
+    QPushButton* latexButton;
+
     QTemporaryFile* imageFile;
   };
 
@@ -184,7 +189,7 @@ namespace IAEX
     void forwardAction( int );
     void updatePos(int, int);
     void setState(int);
-    void showVariableButton(bool);
+    //void showVariableButton(bool);
 
   protected:
     void mousePressEvent(QMouseEvent *event);

OMNotebook/OMNotebookGUI/notebook.cpp

@@ -4092,10 +4092,13 @@ void NotebookWindow::shiftcellsUp()
                     subject_->cursorStepUp();
                     subject_->executeCommand(new CreateNewCellCommand("Latex"));
                     LatexCell *newcell = dynamic_cast<LatexCell *>(subject_->getCursor()->currentCell());
-                    newcell->setEvaluated(true);
-                    newcell->setClosed(false);
+                    //newcell->setEvaluated(true);
+                   // newcell->setClosed(false);
                     newcell->setText(latexinput);
                     newcell->setTextOutputHtml(latexoutput);
+                    newcell->input_->hide();
+                    newcell->output_->show();
+                    newcell->latexButton->show();
                     }
                     else
                     {
@@ -4211,10 +4214,13 @@ void NotebookWindow::shiftcellsDown()
                 subject_->cursorStepDown();
                 subject_->executeCommand(new CreateNewCellCommand("Latex"));
                 LatexCell *newcell_d = dynamic_cast<LatexCell *>(subject_->getCursor()->currentCell());
-                newcell_d->setEvaluated(true);
-                newcell_d->setClosed(false);
+                //newcell_d->setEvaluated(true);
+                //newcell_d->setClosed(false);
                 newcell_d->setText(latexinput_d);
                 newcell_d->setTextOutputHtml(latexoutput_d);
+                newcell_d->input_->hide();
+                newcell_d->output_->show();
+                newcell_d->latexButton->show();
                 }
                 else
                 {
@@ -4266,10 +4272,10 @@ void NotebookWindow::evalall()
                 g->eval();
             }
 
-            if(LatexCell *g = dynamic_cast<LatexCell*>(cellcount[i]))
+           /* if(LatexCell *g = dynamic_cast<LatexCell*>(cellcount[i]))
             {
                 g->eval();
-            }
+            } */
 
 
             if(InputCell *g = dynamic_cast<InputCell*>(cellcount[i]))

OMNotebook/OMNotebookGUI/xmlparser.cpp

@@ -737,6 +737,15 @@ namespace IAEX
           {
             LatexCell *iCell = dynamic_cast<LatexCell*>(latexcell);
             iCell->setTextOutput( e.text() );
+            if(!e.text().isEmpty())
+            {
+            iCell->output_->show();
+            iCell->latexButton->show();
+            }
+            else
+            {
+             iCell->input_->show();
+            }
           }
           else if( e.tagName() == XML_IMAGE )
           {
@@ -763,19 +772,18 @@ namespace IAEX
 
       //    graphcell->setText( text ); //fjass
 
-      LatexCell *gCell = dynamic_cast<LatexCell*>(latexcell);
+      /* LatexCell *gCell = dynamic_cast<LatexCell*>(latexcell);
 
       QString closed = element.attribute( XML_CLOSED, XML_FALSE );
       if( closed == XML_TRUE )
         gCell->setClosed( true,true );
       else if( closed == XML_FALSE )
         gCell->setClosed( false,true );
       else
-        throw runtime_error( "Unknown closed value in latexcell" );
+        throw runtime_error( "Unknown closed value in latexcell" ); */
 
       parent->addChild(latexcell);
 
-
   }
 
 
@@ -851,6 +859,8 @@ namespace IAEX
 
         latexcell->setTextOutputHtml( html );
         latexcell->output_->textCursor().insertImage(newname);
+        latexcell->output_->show();
+        latexcell->latexButton->show();
       }
 
       else