Commit 44d56820 authored by William McLendon's avatar William McLendon

BUG: Fixed a scoping issue that prevented selections from tables with multiple...

BUG: Fixed a scoping issue that prevented selections from tables with multiple rows from ever getting propagated.  Added ivars for setting a proxy (not implemented yet).
parent dc88e825
......@@ -49,7 +49,7 @@ PURPOSE. See the above copyright notice for more information.
#include <QWebHistory>
#include <QWebView>
vtkCxxRevisionMacro(vtkQtRichTextView, "1.12");
vtkCxxRevisionMacro(vtkQtRichTextView, "1.13");
vtkStandardNewMacro(vtkQtRichTextView);
/////////////////////////////////////////////////////////////////////////////
......@@ -77,7 +77,9 @@ public:
// vtkQtRichTextView
vtkQtRichTextView::vtkQtRichTextView() :
Internal(new Implementation())
Internal(new Implementation()),
ProxyPort(0),
ProxyURL(0)
{
this->Internal->DataObjectToTable = vtkSmartPointer<vtkDataObjectToTable>::New();
this->Internal->DataObjectToTable->SetFieldType(ROW_DATA);
......@@ -85,7 +87,6 @@ vtkQtRichTextView::vtkQtRichTextView() :
this->Internal->Widget = new QWidget();
this->Internal->UI.setupUi(this->Internal->Widget);
this->Internal->UI.WebView->setHtml("");
QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy,"wwwproxy.sandia.gov",80);
QNetworkProxy::setApplicationProxy(proxy);
......@@ -164,6 +165,7 @@ void vtkQtRichTextView::Update()
else
{
// Figure-out which row of the table we're going to display (if any) ...
row_valid = false;
if(vtkSelection* const selection = representation->GetAnnotationLink()->GetCurrentSelection())
{
if(vtkSelectionNode* const selection_node = selection->GetNumberOfNodes() ? selection->GetNode(0) : 0)
......
......@@ -70,6 +70,16 @@ public:
void SetFieldType(int);
int GetFieldType();
// Description:
// This field sets a URL for a HTTP proxy server.
vtkSetStringMacro(ProxyURL);
vtkGetStringMacro(ProxyURL);
// Description:
// This fields sets the port number for a HTTP proxy server.
vtkSetMacro(ProxyPort, int);
vtkGetMacro(ProxyPort, int);
// Description:
// Updates the view.
virtual void Update();
......@@ -86,6 +96,9 @@ private:
vtkQtRichTextView(const vtkQtRichTextView&); // Not implemented.
void operator=(const vtkQtRichTextView&); // Not implemented.
char* ProxyURL;
int ProxyPort;
class Implementation;
Implementation* const Internal;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment