Short Description: Preparation for Qt4 GraphicsView-based Accounting Workspace Bug Number: n/a Release notes (y/n): no, not yet. For Release Nums: 6.1 (1) New set of (Sim) CanvasIDs and (Q3GUI Workspace) "CanvasRefs" (2) Preparation for removal of the old Qt3 Simulation Workspace classes. (3) Coordination of SimObj graphics item position moves between the two Accounting workspaces (new and old). NOTE: It's not important to have that synchronization working as such -- because the old Qt3 Accounting workspace will be going away -- but this is just a way of insuring that position update notifications from the Sim library are being processed correctly. ------------------ Sim/CanvasDefs.hpp Sim/CanvasDefs.cpp Sim/SimWS.cpp ------------------ New CanvasID definitions: CanvasID_SIMULATION = 0 // Qt4 Graphics View [RW 5.1] CanvasID_ACCOUNTING = 1 // Qt4 Graphics View [RW 6.1] CanvasID_GEOSPATIAL = 2 // Qt4 Graphics View [RW 5.1] CanvasID_OLD_ACCT = 3 // Qt3 Canvas View [RW 5.1] REMOVED: CanvasID_OLD_SIM CanvasID_ACCOUNTING and CanvasID_OLD_ACCT share the same "geometry" (CanvasGeometry. Basically, graphics item positions): Geom_ACCOUNTING. ------------------- Q3GUI/Workspace.cpp Q3GUI/Workspace.hpp ------------------- New CanvasRef pointers: CanvasRef* _sim4CanRef; // CanvasDefs::CanvasID_SIMULATION CanvasRef* _acc4CanRef; // CanvasDefs::CanvasID_ACCOUNTING <<< NEW CanvasRef* _geo4CanRef; // CanvasDefs::CanvasID_GEOSPATIAL CanvasRef* _acc3CanRef; // CanvasDefs::CanvasID_OLD_ACCT REMOVED: CanvasRef* _sim3CanRef; // CanvasDefs::CanvasID_OLD_SIM Conditional Workspace Availability: static const bool SHOW_QT3_ACC_WORKSPACE (true); static const bool SHOW_QT4_ACC_WORKSPACE (false); -------------- Sim/SimObj.cpp -------------- Do generate OBJECT_MOVED_ACC callbacks from the setAccountingXY (and related single-coordinate methods). --------------------------- Q3GUI/IconItem.cpp Q3GUI/IconItem.hpp Q3GUI/SimObjRegionItem.cpp Q3GUI/SimObjRegionItem.hpp --------------------------- Simplified translation of vertical Accounting coordinate (Y): minor vertical fudge terms removed. Now there is only a vertical reversal. The significance of this will be very short-lived, as this applies only to the "OLD" (Qt3) Accounting Workspace -- but it simplifies the coordination of position updates between the (temporary) TWO Accounting workspaces (new and old). -------------------------- Q3GUI/LocatorCanvas.cpp Q3GUI/WorkspaceCanvas.cpp Q3GUI/AccountingCanvas.cpp QtUtils/SimObjGfxItem.cpp QtUtils/WorkspaceGfxScene.cpp -------------------------- Client mods for CanvasDefs changes. -------------------------- Q3GUI/SimulationCanvas.cpp Q3GUI/SimulationCanvas.hpp -------------------------- Gutted, in preparation for removal. -------------------- Q3GUI/LocatorDlg.cpp -------------------- Minor: additional include required because of the "gutting" of the Q3GUI/SimulationCanvas class files (in preparation for their removal). ---