diff --git a/dispatch_release_dll_to_qgis.bat b/dispatch_release_dll_to_qgis.bat index 827aa89..e9b6da1 100644 --- a/dispatch_release_dll_to_qgis.bat +++ b/dispatch_release_dll_to_qgis.bat @@ -6,8 +6,8 @@ copy .\doc\qgis_umesh_installation.pdf "c:\Program Files\Deltares\qgis_umesh\do copy .\icons\*.* "c:\Program Files\Deltares\qgis_umesh\icons\*.*" rem copy to Bulletin -copy "c:\OSGeo4W\apps\qgis\plugins\qgis_umesh.dll" n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.30.03_qgis_umesh\*.* -copy .\doc\qgis_umesh_um.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.30.03_qgis_umesh\doc\*.* -copy .\doc\qgis_umesh_installation.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.30.03_qgis_umesh\doc\*.* -copy .\icons\*.* n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.30.03_qgis_umesh\icons\*.* +copy "c:\OSGeo4W\apps\qgis\plugins\qgis_umesh.dll" n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.38.00_qgis_umesh\*.* +copy .\doc\qgis_umesh_um.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.38.00_qgis_umesh\doc\*.* +copy .\doc\qgis_umesh_installation.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.38.00_qgis_umesh\doc\*.* +copy .\icons\*.* n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.38.00_qgis_umesh\icons\*.* rem pause diff --git a/lib/x64/debug/qgis_analysis.lib b/lib/x64/debug/qgis_analysis.lib index 788e095..f8dfb9f 100644 Binary files a/lib/x64/debug/qgis_analysis.lib and b/lib/x64/debug/qgis_analysis.lib differ diff --git a/lib/x64/debug/qgis_core.lib b/lib/x64/debug/qgis_core.lib index 585bab3..035a717 100644 Binary files a/lib/x64/debug/qgis_core.lib and b/lib/x64/debug/qgis_core.lib differ diff --git a/lib/x64/debug/qgis_gui.lib b/lib/x64/debug/qgis_gui.lib index cbd5fa2..fde27ce 100644 Binary files a/lib/x64/debug/qgis_gui.lib and b/lib/x64/debug/qgis_gui.lib differ diff --git a/lib/x64/release/qgis_analysis.lib b/lib/x64/release/qgis_analysis.lib index 788e095..f8dfb9f 100644 Binary files a/lib/x64/release/qgis_analysis.lib and b/lib/x64/release/qgis_analysis.lib differ diff --git a/lib/x64/release/qgis_core.lib b/lib/x64/release/qgis_core.lib index 585bab3..035a717 100644 Binary files a/lib/x64/release/qgis_core.lib and b/lib/x64/release/qgis_core.lib differ diff --git a/lib/x64/release/qgis_gui.lib b/lib/x64/release/qgis_gui.lib index cbd5fa2..fde27ce 100644 Binary files a/lib/x64/release/qgis_gui.lib and b/lib/x64/release/qgis_gui.lib differ diff --git a/packages/qgis_umesh.vcxproj b/packages/qgis_umesh.vcxproj index be4b8d1..ed61d1f 100644 --- a/packages/qgis_umesh.vcxproj +++ b/packages/qgis_umesh.vcxproj @@ -208,7 +208,7 @@ call ..\scripts\git_insert_hash.cmd .\include qqis_umesh_version.rc Console - false + true c:\OSGeo4W\apps\qgis\plugins\$(ProjectName).pdb diff --git a/packages/src/MyDrawingCanvas.cpp b/packages/src/MyDrawingCanvas.cpp index 3cc4670..feb91fe 100644 --- a/packages/src/MyDrawingCanvas.cpp +++ b/packages/src/MyDrawingCanvas.cpp @@ -892,51 +892,54 @@ void MyCanvas::draw_data_along_edge() string var_name = var->var_name; struct _mesh1d* mesh1d = m_ugrid_file->get_mesh_1d(); - DataValuesProvider2Dstd_data_at_node = m_ugrid_file->get_variable_values(var_name); - z_value = std_data_at_node.GetValueAtIndex(m_current_step, 0); - int length = std_data_at_node.m_numXY; + if (mesh1d != nullptr) + { + DataValuesProvider2Dstd_data_at_node = m_ugrid_file->get_variable_values(var_name); + z_value = std_data_at_node.GetValueAtIndex(m_current_step, 0); + int length = std_data_at_node.m_numXY; - dims = var->dims; + dims = var->dims; - struct _edge* edges = mesh1d->edge[0]; - this->startDrawing(CACHE_1D); - double opacity = mCache_painter->opacity(); - mCache_painter->setOpacity(m_property->get_opacity()); - this->setPointSize(13); - vector edge_x(2); - vector edge_y(2); - vector edge_color(2); + struct _edge* edges = mesh1d->edge[0]; + this->startDrawing(CACHE_1D); + double opacity = mCache_painter->opacity(); + mCache_painter->setOpacity(m_property->get_opacity()); + this->setPointSize(13); + vector edge_x(2); + vector edge_y(2); + vector edge_color(2); - double missing_value = var->fill_value; - determine_min_max(z_value, length, &m_z_min, &m_z_max, missing_value); + double missing_value = var->fill_value; + determine_min_max(z_value, length, &m_z_min, &m_z_max, missing_value); - if (true) // boolean to draw gradient along line? - { - for (int j = 0; j < edges->count; j++) + if (true) // boolean to draw gradient along line? { - int p1 = edges->edge_nodes[j][0]; - int p2 = edges->edge_nodes[j][1]; - edge_x[0] = mesh1d->node[0]->x[p1]; - edge_y[0] = mesh1d->node[0]->y[p1]; - edge_x[1] = mesh1d->node[0]->x[p2]; - edge_y[1] = mesh1d->node[0]->y[p2]; + for (int j = 0; j < edges->count; j++) + { + int p1 = edges->edge_nodes[j][0]; + int p2 = edges->edge_nodes[j][1]; + edge_x[0] = mesh1d->node[0]->x[p1]; + edge_y[0] = mesh1d->node[0]->y[p1]; + edge_x[1] = mesh1d->node[0]->x[p2]; + edge_y[1] = mesh1d->node[0]->y[p2]; - edge_color[0] = m_ramph->getRgbFromValue(z_value[p1]); - edge_color[1] = m_ramph->getRgbFromValue(z_value[p2]); + edge_color[0] = m_ramph->getRgbFromValue(z_value[p1]); + edge_color[1] = m_ramph->getRgbFromValue(z_value[p2]); - this->drawLineGradient(edge_x, edge_y, edge_color); + this->drawLineGradient(edge_x, edge_y, edge_color); + } } - } - if (false) // boolean to draw multidot? - { - m_rgb_color.resize(length); - for (int j = 0; j < length; j++) + if (false) // boolean to draw multidot? { - m_rgb_color[j] = m_ramph->getRgbFromValue(z_value[j]); + m_rgb_color.resize(length); + for (int j = 0; j < length; j++) + { + m_rgb_color[j] = m_ramph->getRgbFromValue(z_value[j]); + } + this->drawMultiDot(mesh1d->node[0]->x, mesh1d->node[0]->y, m_rgb_color); } - this->drawMultiDot(mesh1d->node[0]->x, mesh1d->node[0]->y, m_rgb_color); + mCache_painter->setOpacity(opacity); } - mCache_painter->setOpacity(opacity); } } }