Move back PyErrorWidget & PyCellViewer into viewer.

Script was needlessly including PyCellViewer.h it seems. Removed it.
This reverts commit 6963a0baa6a19f538e822d4b254b91123dd1dc66.

crlcore/python/helpers/io.py

@@ -20,8 +20,8 @@ import os.path
 import re
 import traceback
 from   ..          import Cfg
-from   ..Hurricane import UpdateSession, ErrorWidget
+from   ..Hurricane import UpdateSession
-from   ..Viewer    import Graphics
+from   ..Viewer    import Graphics, ErrorWidget
 
 
 def textStackTrace ( trace, showIndent=True, scriptPath=None ):

crlcore/src/ccore/Utilities.cpp

@@ -257,6 +257,9 @@ namespace CRL {
     if (coriolis_top_env) {
       coriolis_top = coriolis_top_env;
     } else {
+      // In this case, we are running as a binary and PyCRL module hasn't been
+      // instanciated yet. Use Python to self-locate ourselves. That is, the
+      // full path to ".../site-packages/coriolis/".
       std::error_code     rvalue;
       bprocess::ipstream  pipeout;
       string command = "python3 -c 'from coriolis import CRL;"

etesian/src/PyEtesianEngine.cpp

@@ -17,9 +17,9 @@
 #include "hurricane/isobar/PyBox.h"
 #include "hurricane/isobar/PyCell.h"
 #include "hurricane/isobar/PyInstance.h"
-#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/Cell.h"
 #include "hurricane/viewer/ExceptionWidget.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "etesian/PyEtesianEngine.h"
 
 # undef   ACCESS_OBJECT

hurricane/src/isobar/PyHurricane.cpp

@@ -89,8 +89,6 @@
 #include "hurricane/isobar/PyUnitRule.h"
 #include "hurricane/isobar/PyPhysicalRule.h"
 #include "hurricane/isobar/PyTwoLayersPhysicalRule.h"
-#include "hurricane/isobar/PyErrorWidget.h"
-#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/NetExternalComponents.h"
 #include <stddef.h>
 
@@ -617,8 +615,6 @@ extern "C" {
     PyUnitRule_LinkPyType();
     PyPhysicalRule_LinkPyType();
     PyTwoLayersPhysicalRule_LinkPyType();
-    PyErrorWidget_LinkPyType();
-    PyCellViewer_LinkPyType();
 
     PYTYPE_READY( AttributesHolder              )
     PYTYPE_READY( DebugSession                  )
@@ -687,8 +683,6 @@ extern "C" {
     PYTYPE_READY( QueryMask                     )
     PYTYPE_READY( DeviceDescriptor              )
     PYTYPE_READY( Rule                          )
-    PYTYPE_READY( ErrorWidget                   )
-    PYTYPE_READY( CellViewer                    )
 
     PYTYPE_READY_SUB( BasicLayer     , Layer    )
     PYTYPE_READY_SUB( RegularLayer   , Layer    )
@@ -886,10 +880,7 @@ extern "C" {
     PyModule_AddObject ( module, "Polygon"              , (PyObject*)&PyTypePolygon );
     Py_INCREF( &PyTypeDeviceDescriptor );
     PyModule_AddObject( module, "DeviceDescriptor"      , (PyObject*)&PyTypeDeviceDescriptor );
-    Py_INCREF( &PyTypeErrorWidget );
+    
-    PyModule_AddObject( module, "ErrorWidget"           , (PyObject*)&PyTypeErrorWidget );
-    Py_INCREF( &PyTypeCellViewer );
-    PyModule_AddObject( module, "CellViewer"            , (PyObject*)&PyTypeCellViewer );
     
     PyObject* dictionnary = PyModule_GetDict ( module );
 
@@ -915,7 +906,6 @@ extern "C" {
     PyCell_postModuleInit();
     PyInstance_postModuleInit();
     PyQuery_postModuleInit();
-    PyCellViewer_postModuleInit();
 
   //Py_AtExit( showAtExit );
 

hurricane/src/isobar/Script.cpp

@@ -21,7 +21,6 @@
 #include  "hurricane/Error.h"
 #include  "hurricane/Cell.h"
 #include  "hurricane/isobar/PyCell.h"
-#include  "hurricane/isobar/PyCellViewer.h"
 #include  "hurricane/isobar/Script.h"
 
 
@@ -29,7 +28,6 @@ namespace Isobar {
 
   using std::string;
   using Hurricane::Cell;
-  using Hurricane::CellViewer;
 
 
 // -------------------------------------------------------------------

hurricane/src/isobar/meson.build

@@ -76,9 +76,7 @@ isobar_sources = files([
   'PyUnitRule.cpp',
   'PyPhysicalRule.cpp',
   'PyTwoLayersPhysicalRule.cpp',
-  'Script.cpp',
+  'Script.cpp'
-  'PyCellViewer.cpp',
-  'PyErrorWidget.cpp',
 ])
 
 isobar = library(
@@ -90,13 +88,3 @@ isobar = library(
   install: true,
 )
 
-py.extension_module(
-  'Hurricane',
-  isobar_sources,
-  dependencies: [qt_deps, py_deps, boost],
-  link_with: [isobar, hurricane],
-  include_directories: hurricane_includes,
-  install: true,
-  subdir: 'coriolis'
-)
-

hurricane/src/meson.build

@@ -20,7 +20,7 @@ py.extension_module(
   'Hurricane',
   isobar_sources,
   dependencies: [qt_deps, py_mod_deps, boost],
-  link_with: [isobar, viewer],
+  link_with: [isobar],
   include_directories: hurricane_includes,
   install: true,
   subdir: 'coriolis'

hurricane/src/viewer/CellViewer.cpp

@@ -51,7 +51,7 @@
 #include "hurricane/viewer/DesignBlob.h"
 #include "hurricane/viewer/OpenBlobDialog.h"
 #include "hurricane/viewer/SelectCommand.h"
-#include "hurricane/isobar/PyCellViewer.h"
+#include "hurricane/viewer/PyCellViewer.h"
 
 
 namespace Hurricane {

hurricane/src/viewer/PyCellViewer.cpp

@@ -17,7 +17,7 @@
 #include "hurricane/isobar/PyBox.h"
 #include "hurricane/isobar/PyCell.h"
 #include "hurricane/isobar/PyOccurrence.h"
-#include "hurricane/isobar/PyCellViewer.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "hurricane/viewer/CellWidget.h"
 
 

hurricane/src/viewer/PyErrorWidget.cpp

@@ -14,7 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#include "hurricane/isobar/PyErrorWidget.h"
+#include "hurricane/viewer/PyErrorWidget.h"
 
 
 namespace  Isobar {

hurricane/src/viewer/PyViewer.cpp

@@ -21,6 +21,8 @@
 #include "hurricane/viewer/PyDrawingGroup.h"
 #include "hurricane/viewer/PyDisplayStyle.h"
 #include "hurricane/viewer/PyHSVr.h"
+#include "hurricane/viewer/PyErrorWidget.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "hurricane/viewer/PyAboutWindow.h"
 
 
@@ -89,6 +91,8 @@ extern "C" {
     PyDisplayStyleVector_LinkPyType ();
     PyHApplication_LinkPyType ();
     PyGraphics_LinkPyType ();
+    PyErrorWidget_LinkPyType ();
+    PyCellViewer_LinkPyType ();
     PyAboutWindow_LinkPyType ();
     
     PYTYPE_READY ( HSVr );
@@ -103,12 +107,15 @@ extern "C" {
     PYTYPE_READY ( DisplayStyleVectorIterator );
     PYTYPE_READY ( HApplication );
     PYTYPE_READY ( Graphics );
+    PYTYPE_READY ( ErrorWidget );
+    PYTYPE_READY ( CellViewer );
     PYTYPE_READY ( AboutWindow );
     
     // Identifier string can take up to 10 characters.
     __cs.addType ( "hsvr"      , &PyTypeHSVr        , "<HSVr>"        , false );
     __cs.addType ( "displaySty", &PyTypeDisplayStyle, "<DisplayStyle>", false );
     __cs.addType ( "graphics"  , &PyTypeGraphics    , "<Graphics>"    , false );
+    __cs.addType ( "cellView"  , &PyTypeCellViewer  , "<CellViewer>"  , false );
     
     PyObject* module = PyModule_Create( &PyViewer_ModuleDef );
     if ( module == NULL ) {
@@ -123,10 +130,15 @@ extern "C" {
     PyModule_AddObject ( module, "HApplication", (PyObject*)&PyTypeHApplication );
     Py_INCREF ( &PyTypeGraphics );
     PyModule_AddObject ( module, "Graphics"    , (PyObject*)&PyTypeGraphics );
+    Py_INCREF ( &PyTypeCellViewer );
+    PyModule_AddObject ( module, "ErrorWidget" , (PyObject*)&PyTypeErrorWidget );
+    Py_INCREF ( &PyTypeErrorWidget );
+    PyModule_AddObject ( module, "CellViewer"  , (PyObject*)&PyTypeCellViewer );
     Py_INCREF ( &PyTypeAboutWindow );
     PyModule_AddObject ( module, "AboutWindow" , (PyObject*)&PyTypeAboutWindow );
     
     PyDisplayStyle_postModuleInit();
+    PyCellViewer_postModuleInit();
 
     cdebug_log(20,0) << "Viewer.so loaded " << (void*)&typeid(string) << endl;
 

hurricane/src/viewer/meson.build

@@ -32,7 +32,9 @@ viewer_mocs = qt.compile_moc(
     'hurricane/viewer/DisplayFilterWidget.h',
     'hurricane/viewer/ControllerWidget.h',
     'hurricane/viewer/ScriptWidget.h',
-    'hurricane/viewer/AboutWindow.h'
+    'hurricane/viewer/AboutWindow.h',
+    'hurricane/viewer/PyErrorWidget.h',
+    'hurricane/viewer/PyCellViewer.h'
   ],
   include_directories: hurricane_includes
 )
@@ -49,7 +51,9 @@ viewer_py = files([
   'PyHApplication.cpp',
   'PyGraphics.cpp',
   'PyViewer.cpp',
-  'PyAboutWindow.cpp'
+  'PyAboutWindow.cpp',
+  'PyErrorWidget.cpp',
+  'PyCellViewer.cpp'
 ])
  
 viewer = shared_library(

katana/src/PyKatanaEngine.cpp

@@ -16,8 +16,8 @@
 
 #include "hurricane/isobar/PyNet.h"
 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/isobar/PyCellViewer.h"
 #include "hurricane/viewer/ExceptionWidget.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "hurricane/Cell.h"
 #include "katana/PyKatanaEngine.h"
 #include "katana/PyKatanaFlags.h"

unicorn/src/UnicornGui.cpp

@@ -22,7 +22,7 @@
 #include "hurricane/DataBase.h"
 #include "hurricane/isobar/Script.h"
 #include "hurricane/viewer/CellViewer.h"
-#include "hurricane/isobar/PyCellViewer.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "crlcore/Utilities.h"
 #include "crlcore/Catalog.h"
 #include "crlcore/AllianceFramework.h"

unicorn/src/unicorn/PyUnicornGui.h

@@ -19,7 +19,7 @@
 #define __UNICORN_PY_UNICORN_GUI_H__
 
 #include "hurricane/isobar/PyHurricane.h"
-#include "hurricane/isobar/PyCellViewer.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "unicorn/UnicornGui.h"