- Removed 3D support from OMNotebook

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10880 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

OMNotebook/OMNotebookGUI/OMNotebook.config.in

@@ -2,12 +2,6 @@ QMAKE_CC  = @CC@
 QMAKE_CXX = @CXX@
 QMAKE_LINK = @CXX@
 
-COIN_LIBS = @COIN_LIBS@
-SOQT_LIBS = @SOQT_LIBS@
-COIN_INCLUDE = @COIN_INCLUDE@
-SOQT_INCLUDE = @SOQT_INCLUDE@
-HAVE_COIN = @HAVE_COIN@
-
 CORBALIBS = @CORBALIBS@
 CORBAINC = @CORBA_QMAKE_INCLUDES@
 USE_CORBA = @QT_USE_CORBA@

OMNotebook/OMNotebookGUI/OMNotebookGUI.pro

@@ -44,8 +44,6 @@ SOURCES += \
     graphcell.cpp \
     evalthread.cpp \
     indent.cpp \
-    ../3Dpkg/SimulationData.cpp \
-    ../3Dpkg/VisualizationWidget.cpp \
     ../OMSketch/Tools.cpp \
     ../OMSketch/Sketch_files.cpp \
     ../OMSketch/Shapes.cpp \
@@ -122,8 +120,6 @@ HEADERS += \
     graphcell.h \
     evalthread.h \
     indent.h \
-    ../3Dpkg/SimulationData.h \
-    ../3Dpkg/VisualizationWidget.h \
     omc_communicator.h \
     ../OMSketch/Tools.h \
     ../OMSketch/Sketch_files.h \
@@ -148,12 +144,7 @@ HEADERS += \
 
 FORMS += ImageSizeDlg.ui \
     OtherDlg.ui \
-    searchform.ui \
-    ../Pltpkg2/compoundWidget.ui\
-    ../Pltpkg2/dataSelect.ui\
-    ../Pltpkg2/graphWindow.ui\
-    ../Pltpkg2/preferences.ui \
-    ../Pltpkg2/newgraph.ui
+    searchform.ui
 # -------For OMNIorb
 win32 {
   DEFINES += __x86__ \
@@ -162,19 +153,15 @@ win32 {
              __WIN32__
   CORBAINC = $$(OMDEV)/lib/omniORB-4.1.4-mingw/include
   CORBALIBS = -L$$(OMDEV)/lib/omniORB-4.1.4-mingw/lib/x86_win32 -lomniORB414_rt -lomnithread34_rt
-  COIN_LIBS =
-  SOQT_LIBS =
   USE_CORBA = USE_OMNIORB
 } else {
   include(OMNotebook.config)
 }
 #---------End OMNIorb
 
-DEFINES += $${HAVE_COIN} $${USE_CORBA}
-LIBS += $${CORBALIBS} $${COIN_LIBS} $${SOQT_LIBS}
+DEFINES += $${USE_CORBA}
+LIBS += $${CORBALIBS}
 INCLUDEPATH += $${CORBAINC} \
-               ../Pltpkg2 \
-               ../3Dpkg \
                ../OMSketch \
                ../../
 

OMNotebook/OMNotebookGUI/cellapplication.cpp

@@ -94,11 +94,7 @@ namespace IAEX
     : QObject()
   {
     app_ = new QApplication(argc, argv);
-#ifdef HAVE_COIN
-    mainWindow = SoQt::init(argc, argv, argv[0]);
-#else
     mainWindow = new QMainWindow();
-#endif
     QDir dir;
 
     // 2005-10-25 AF, added a check if omc is running, otherwise

OMNotebook/OMNotebookGUI/graphcell.cpp

@@ -525,8 +525,6 @@ namespace IAEX {
 
     connect(output_, SIGNAL(anchorClicked(const QUrl&)), input_, SLOT(goToPos(const QUrl&)));
 
-    showGraph = false;
-
     imageFile=0;
   }
 
@@ -1293,12 +1291,6 @@ namespace IAEX {
     return evaluated_;
   }
 
-  void GraphCell::showGraphics()
-  {
-    showGraph = true;
-    contentChanged();
-  }
-
   bool GraphCell::isQtPlot(QString text)
   {
     QRegExp exp("plot[ ]*\\(.*\\)|plotParametric[ ]*\\(.*\\)|plotAll[ ]*\\(.*\\)" );
@@ -1422,16 +1414,11 @@ namespace IAEX {
       // remove plot.png if it already exist, don't want any
       // old plot.
       bool newPlot = isQtPlot(input_->toPlainText());
-      bool visualize = isVisualize(input_->toPlainText());
 
       if(newPlot)
       {
         setClosed(false);
       } 
-      else if (visualize)
-      {
-        showGraphics();
-      }
 
       // 2006-02-02 AF, Added try-catch
       QString res, error;
@@ -1456,7 +1443,7 @@ namespace IAEX {
           EvalThread* et = new EvalThread(getDelegate(), expr);
           connect(et, SIGNAL(finished()), this, SLOT(delegateFinished()));          
           et->start();
-          if (!visualize && !newPlot) { et->wait(); }
+          if (!newPlot) { et->wait(); }
         }
         catch( exception &e )
         {

OMNotebook/OMNotebookGUI/graphcell.h

@@ -128,8 +128,6 @@ namespace IAEX
 
     void delegateFinished();
     void setState(int state);
-    void showGraphics();
-
 
   protected:
     void resizeEvent(QResizeEvent *event);    //AF
@@ -168,7 +166,6 @@ namespace IAEX
     Document *document_;
 
   public:
-    bool showGraph;
     QPushButton* variableButton;
     QTemporaryFile* imageFile;
   };

OMNotebook/OMNotebookGUI/serializingvisitor.cpp

@@ -254,8 +254,6 @@ namespace IAEX
     else
       graphcell.setAttribute( XML_CLOSED, XML_FALSE );
 
-    graphcell.setAttribute( XML_GRAPHCELL_SHOWGRAPH, node->showGraph?XML_TRUE:XML_FALSE);
-
     // Create an text element (for input) and append it to the element
     QDomElement textelement = domdoc_.createElement( XML_INPUTPART );
     QDomText textnode = domdoc_.createTextNode( node->text() );

OMNotebook/OMNotebookGUI/xmlparser.cpp

@@ -626,13 +626,6 @@ namespace IAEX
     else
       throw runtime_error( "Unknown closed value in inputcell" );
 
-    bool showGraphics = (element.attribute(XML_GRAPHCELL_SHOWGRAPH, XML_FALSE) == XML_TRUE)?true:false;
-    if(showGraphics)
-    {
-      gCell->showGraph = true;
-      gCell->showGraphics();
-    }
-
     parent->addChild( graphcell );
   }
 

OMNotebook/OMPlotWindow/OMPlotWindow.config.in

@@ -1,5 +0,0 @@
-HAVE_COIN = @HAVE_COIN@
-COIN_LIBS = @COIN_LIBS@
-SOQT_LIBS = @SOQT_LIBS@
-COIN_INCLUDE = @COIN_INCLUDE@
-SOQT_INCLUDE = @SOQT_INCLUDE@

OMNotebook/OMSketch/Tools.cpp

@@ -13,7 +13,7 @@ Tools::Tools(Document *document1,DocumentView *doc1):document(document1),doc_vie
     rect = new QToolButton();
     hlayout = new QVBoxLayout;
     main_widget = new QWidget;
-    file_dialog = new QFileDialog(this,"Open","c:",".skh");
+    file_dialog = new QFileDialog(this,"Open",QString(),".skh");
 
 	color_dialog = new QColorDialog(this);
 
@@ -389,7 +389,7 @@ void Tools::draw_new()
 
 	   if(msg->clickedButton()==msg_save)
        {
-          QString file_name=file_dialog->getSaveFileName(this,"Save","c:",tr("Image(*.png)"));
+          QString file_name=file_dialog->getSaveFileName(this,"Save",QString(),tr("Image(*.png)"));
           file_dialog->deleteLater();
 		  if(file_name.contains(".png"))
 			writeImage(file_name);
@@ -420,7 +420,7 @@ void Tools::draw_save()
 			  break;
 		  else if(opt==QMessageBox::Yes)
 		  {
-			  QString file_name=file_dialog->getSaveFileName(this,"Save","c:",tr("Image(*.png);;Image(*.jpg);;Images(*.bmp)"));
+			  QString file_name=file_dialog->getSaveFileName(this,"Save",QString(),tr("Image(*.png);;Image(*.jpg);;Images(*.bmp)"));
 
 			  QMessageBox::about(this,"file name ",file_name);  
 			  writeImage(file_name);
@@ -534,7 +534,7 @@ void Tools::draw_save()
 
 void Tools::draw_open()
 {
-    QString file_name=file_dialog->getOpenFileName(this,"Open","c:","*.png *.jpg *.bmp" );
+    QString file_name=file_dialog->getOpenFileName(this,"Open",QString(),"*.png *.jpg *.bmp" );
 
 	if(!isSaved)
 		draw_save();
@@ -1078,7 +1078,7 @@ void Tools::draw_shapes()
 void Tools::msg_save_file()
 {
    qDebug()<<"Entered \n";
-   QString file_name=file_dialog->getSaveFileName(this,"Save","c:","*.skh");
+   QString file_name=file_dialog->getSaveFileName(this,"Save",QString(),"*.skh");
    file_dialog->deleteLater();
    scene->save_Scene(file_name);
    scene->new_Scene();
@@ -1379,7 +1379,7 @@ void Tools::closeEvent(QCloseEvent* event)
 		{
            if(!isSaved)
 		   {
-	   	      QString file_name=file_dialog->getSaveFileName(this,"Save","c:",tr("Image(*.png)"));
+	   	      QString file_name=file_dialog->getSaveFileName(this,"Save",QString(),tr("Image(*.png)"));
 		      if(file_name.contains(".png"))
 			     writeImage(file_name);
 		   }