Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a061b6f9ea8
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8cf9d68ecf63
Choose a head ref
  • 1 commit
  • 7 files changed
  • 1 contributor

Commits on Sep 30, 2020

  1. IDF file Linking. 

    Can read PCB outlines and cutouts, as well as Pin and Mounting holes. A simple PPCB model sans components is added to the assembly.
    @phkahler
    phkahler committed Sep 30, 2020
    Copy the full SHA
    8cf9d68 View commit details
Showing with 522 additions and 1 deletion.
  1. +1 −0 src/CMakeLists.txt
  2. +10 −0 src/file.cpp
  3. +1 −1 src/group.cpp
  4. +500 −0 src/importidf.cpp
  5. +5 −0 src/platform/gui.cpp
  6. +2 −0 src/platform/gui.h
  7. +3 −0 src/solvespace.h
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -175,6 +175,7 @@ set(solvespace_core_SOURCES
group.cpp
groupmesh.cpp
importdxf.cpp
importidf.cpp
mesh.cpp
modify.cpp
mouse.cpp
10 changes: 10 additions & 0 deletions src/file.cpp
View file
Original file line number Diff line number Diff line change
@@ -702,6 +702,16 @@ void SolveSpaceUI::UpgradeLegacyData() {

bool SolveSpaceUI::LoadEntitiesFromFile(const Platform::Path &filename, EntityList *le,
SMesh *m, SShell *sh)
{
if(strcmp(filename.Extension().c_str(), "emn")==0) {
return LinkIDF(filename, le, m, sh);
} else {
return LoadEntitiesFromSlvs(filename, le, m, sh);
}
}

bool SolveSpaceUI::LoadEntitiesFromSlvs(const Platform::Path &filename, EntityList *le,
SMesh *m, SShell *sh)
{
SSurface srf = {};
SCurve crv = {};
2 changes: 1 addition & 1 deletion src/group.cpp
View file
Original file line number Diff line number Diff line change
@@ -287,7 +287,7 @@ void Group::MenuGroup(Command id, Platform::Path linkFile) {
g.meshCombine = CombineAs::ASSEMBLE;
if(g.linkFile.IsEmpty()) {
Platform::FileDialogRef dialog = Platform::CreateOpenFileDialog(SS.GW.window);
dialog->AddFilters(Platform::SolveSpaceModelFileFilters);
dialog->AddFilters(Platform::SolveSpaceLinkFileFilters);
dialog->ThawChoices(settings, "LinkSketch");
if(!dialog->RunModal()) return;
dialog->FreezeChoices(settings, "LinkSketch");
Loading