Commit 7ec30496 authored by David E. DeMarle's avatar David E. DeMarle

More fixes for export state.

Use "|" as an internal separator instead of "_" because it is
less likely to collide with timestamp and filename characters. Also
automatically strip "*" from recovered writer input variable names.
parent af81abd3
......@@ -105,7 +105,7 @@ bool vtkSMExportProxyDepot::HasWriterProxy(const char* filtername, const char* f
return false;
}
std::string filterhash = filtername;
filterhash += "_";
filterhash += "|";
filterhash += format;
vtkSMSourceProxy* writerProxy =
......@@ -126,7 +126,7 @@ vtkSMSourceProxy* vtkSMExportProxyDepot::GetWriterProxy(
return nullptr;
}
std::string filterhash = filtername;
filterhash += "_";
filterhash += "|";
filterhash += format;
vtkSMSourceProxy* writerProxy =
......@@ -208,7 +208,7 @@ bool vtkSMExportProxyDepot::HasScreenshotProxy(const char* viewname, const char*
}
std::string viewhash = viewname;
viewhash += "_";
viewhash += "|";
viewhash += format;
vtkSMProxy* ssProxy = this->Session->GetProxy("export_screenshots", viewhash.c_str());
......@@ -228,7 +228,7 @@ vtkSMProxy* vtkSMExportProxyDepot::GetScreenshotProxy(
return nullptr;
}
std::string viewhash = viewname;
viewhash += "_";
viewhash += "|";
viewhash += format;
vtkSMProxy* ssProxy = this->Session->GetProxy("export_screenshots", viewhash.c_str());
......
......@@ -180,7 +180,7 @@ void pqCatalystExportReaction::onTriggered()
// done here except cinema image specific parameters
const char* hashname = pxm->GetProxyName("export_writers", nextWriter);
std::string formatS = hashname;
size_t underP = formatS.find_first_of("_");
size_t underP = formatS.find_first_of("|");
std::string filterName = formatS.substr(0, underP);
filterName[0] = tolower(filterName[0]);
......
......@@ -365,8 +365,8 @@ class NewStyleWriters(object):
# skip the array and property export information we stuff in this proxy
continue
inputname = xs.split('_')[0].lower()
writername = xs.split('_')[1]
inputname = xs.split('|')[0].lower().replace("*","")
writername = xs.split('|')[1]
xmlgroup = pxy.GetXMLGroup()
......
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