From: <ibr...@us...> - 2012-06-05 15:38:52
|
Revision: 4334 http://tora.svn.sourceforge.net/tora/?rev=4334&view=rev Author: ibre5041 Date: 2012-06-05 15:38:46 +0000 (Tue, 05 Jun 2012) Log Message: ----------- more experiments, dot is not called anymore Modified Paths: -------------- branches/tora-trotl/src/docklets/toastwalk.cpp branches/tora-trotl/src/docklets/toquerymodel.cpp branches/tora-trotl/src/ermodel/dotgraph.cpp branches/tora-trotl/src/ermodel/dotgraph.h Modified: branches/tora-trotl/src/docklets/toastwalk.cpp =================================================================== --- branches/tora-trotl/src/docklets/toastwalk.cpp 2012-06-04 17:24:57 UTC (rev 4333) +++ branches/tora-trotl/src/docklets/toastwalk.cpp 2012-06-05 15:38:46 UTC (rev 4334) @@ -208,7 +208,7 @@ } ta["name"] = tt->toStringRecursive(false); - ta["label"] = tt->toStringRecursive(false); + ta["label"] = QString("ROOT") + GLUE + tableName; //tt->toStringRecursive(false); ta["fontsize"] = "10"; ta["comment"]= tt->toStringRecursive(false); ta["id"]= QString("ROOT") + GLUE + tableName; @@ -401,5 +401,5 @@ } // case S_WHERE } // switch getTokenType } // for each node - target->update(); + //target->update(); }; Modified: branches/tora-trotl/src/docklets/toquerymodel.cpp =================================================================== --- branches/tora-trotl/src/docklets/toquerymodel.cpp 2012-06-04 17:24:57 UTC (rev 4333) +++ branches/tora-trotl/src/docklets/toquerymodel.cpp 2012-06-05 15:38:46 UTC (rev 4334) @@ -187,14 +187,14 @@ TLOG(0,toDecorator,__HERE__) << "Parsing ok:" << std::endl << stat->root()->toStringRecursive().toStdString() << std::endl; - //delete(m_widget); - //m_widget = new KGraphViewer::DotGraphView( NULL /*actionCollection()*/, this); - m_widget->initEmpty(); - //m_widget->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); - //setFocusProxy(m_widget); // TODO ?? What is this?? - //setWidget(m_widget); // TODO ?? What is this?? - toASTWalk(stat.get(), m_widget->graph()); + //m_widget->initEmpty(); + DotGraph newGraph("dot"); + //toASTWalk(stat.get(), m_widget->graph()); + toASTWalk(stat.get(), &newGraph); + m_widget->graph()->updateWithGraph(newGraph); + //m_widget->graph()->layoutCommand(newGraph.layoutCommand()); + m_widget->graph()->update(); } catch ( SQLParser::ParseException const &e) { Modified: branches/tora-trotl/src/ermodel/dotgraph.cpp =================================================================== --- branches/tora-trotl/src/ermodel/dotgraph.cpp 2012-06-04 17:24:57 UTC (rev 4333) +++ branches/tora-trotl/src/ermodel/dotgraph.cpp 2012-06-05 15:38:46 UTC (rev 4334) @@ -62,6 +62,20 @@ setId("unnamed"); } +DotGraph::DotGraph(const QString& command) : + GraphElement(), + m_dotFileName(""), + m_width(0.0), m_height(0.0),m_scale(1.0), + m_directed(true),m_strict(false), + m_layoutCommand(command), + m_readWrite(false), + m_dot(0), + m_phase(Initial), + m_useLibrary(true) +{ + setId("unnamed"); +} + DotGraph::DotGraph(const QString& command, const QString& fileName) : GraphElement(), m_dotFileName(fileName),m_width(0.0), m_height(0.0),m_scale(1.0), @@ -499,6 +513,9 @@ m_scale=newGraph.scale(); m_directed=newGraph.directed(); m_strict=newGraph.strict(); + if( m_layoutCommand.isEmpty()) + m_layoutCommand = newGraph.layoutCommand(); + computeCells(); foreach (GraphSubgraph* nsg, newGraph.subgraphs()) { Modified: branches/tora-trotl/src/ermodel/dotgraph.h =================================================================== --- branches/tora-trotl/src/ermodel/dotgraph.h 2012-06-04 17:24:57 UTC (rev 4333) +++ branches/tora-trotl/src/ermodel/dotgraph.h 2012-06-05 15:38:46 UTC (rev 4334) @@ -49,6 +49,7 @@ enum ParsePhase {Initial, Final}; DotGraph(); + DotGraph(const QString& command); DotGraph(const QString& command, const QString& fileName); virtual ~DotGraph(); @@ -86,7 +87,7 @@ inline double hdvcf() const {return m_hdvcf;} inline void layoutCommand(const QString& command) {m_layoutCommand = command;} - inline const QString& layoutCommand() {return m_layoutCommand;} + inline const QString& layoutCommand() const {return m_layoutCommand;} inline void dotFileName(const QString& fileName) {m_dotFileName = fileName;} inline const QString& dotFileName() const {return m_dotFileName;} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |