Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Regression: wrong mapping function displayed #3693 #3714

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −10
Open

Fix Regression: wrong mapping function displayed #3693 #3714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/pythonapi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ copy(examples ${PYTHON_API_DIR} EXCLUDE CMakeLists.txt)
add_subdirectory (examples)

add_custom_command(
OUTPUT "${PYTHON_API_DIR}/widget.js"
OUTPUT "${PYTHON_API_DIR}/vapor/widget.js"
COMMAND esbuild --log-level=warning --format=esm "${CMAKE_CURRENT_SOURCE_DIR}/vapor/widget.js" --bundle --outfile="${PYTHON_API_DIR}/vapor/widget.js"
MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/vapor/widget.js"
)
add_custom_target(
widget_js
ALL
DEPENDS "${PYTHON_API_DIR}/widget.js"
DEPENDS "${PYTHON_API_DIR}/vapor/widget.js"
)

# copy(bld.bat ${PYTHON_API_DIR})
Expand Down
2 changes: 1 addition & 1 deletion lib/params/GUIStateParams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ string GUIStateParams::GetActiveRendererInst() const
void GUIStateParams::SetActiveRenderer(string vizWin, string renderType, string renderInst) {
bool e = _ssave->GetUndoEnabled();
_ssave->SetUndoEnabled(false);
BeginGroup("Set active");
BeginGroup("Set active " + renderInst);
SetValueString("Active_Dataset", "", "");
m_activeRenderer->SetActiveRenderer(vizWin, renderType, renderInst);
EndGroup();
Expand Down
16 changes: 9 additions & 7 deletions lib/params/ParamsMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,14 +1322,16 @@ void ParamsMgr::PMgrStateSave::EndGroup()
//
if (_groups.size()) return;

const XmlNode *topNode = NULL;
string s;
topNode = GetTopUndo(s);
if (GetUndoEnabled()) {
const XmlNode *topNode = NULL;
string s;
topNode = GetTopUndo(s);

if (topNode && (*topNode == *_rootNode)) {
// Don't save tree if no changes
//
return;
if (topNode && (*topNode == *_rootNode)) {
// Don't save tree if no changes
//
return;
}
}

if (!_state0) { _state0 = new XmlNode(*_rootNode); }
Expand Down