Windows toolchain update

parent ec130d8c
......@@ -20,4 +20,9 @@
Name="PYTHONDIR"
Value="C:\Python27"
/>
<UserMacro
Name="NUMPYDIR"
Value="C:\Python27\Lib\site-packages\numpy\core\include"
/>
</VisualStudioPropertySheet>
......@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(PYTHONDIR)\include&quot;;&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;"
AdditionalIncludeDirectories="&quot;$(PYTHONDIR)\include&quot;;&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;;&quot;$(PYTHONDIR)\Lib\site-packages\numpy\core\include&quot;"
PreprocessorDefinitions="__STF__;_WIN64;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WXUSINGDLL;__WXMSW__;WXP_USE_THREAD=1;WITH_PYTHON;WITH_BIOSIG2"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -278,7 +278,7 @@
Optimization="3"
EnableIntrinsicFunctions="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="&quot;$(PYTHONDIR)\include&quot;;&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;"
AdditionalIncludeDirectories="&quot;$(PYTHONDIR)\include&quot;;&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;;&quot;$(PYTHONDIR)\Lib\site-packages\numpy\core\include&quot;"
PreprocessorDefinitions="__STF__;_WIN64;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WXUSINGDLL;__WXMSW__;WXP_USE_THREAD=1;WITH_PYTHON;WITH_BIOSIG2"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
......
......@@ -587,6 +587,22 @@
>
</File>
</Filter>
<Filter
Name="intan"
>
<File
RelativePath="..\..\..\..\src\libstfio\intan\common.h"
>
</File>
<File
RelativePath="..\..\..\..\src\libstfio\intan\intanlib.h"
>
</File>
<File
RelativePath="..\..\..\..\src\libstfio\intan\streams.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Source Files"
......@@ -787,6 +803,22 @@
>
</File>
</Filter>
<Filter
Name="intan"
>
<File
RelativePath="..\..\..\..\src\libstfio\intan\common.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\libstfio\intan\intanlib.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\libstfio\intan\streams.cpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="Resource Files"
......
......@@ -20,4 +20,8 @@
Name="PYTHONDIR"
Value="C:\Python27"
/>
<UserMacro
Name="NUMPYDIR"
Value="C:\Python27\Lib\site-packages\numpy\core\include"
/>
</VisualStudioPropertySheet>
......@@ -122,7 +122,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;;&quot;$(PYTHONDIR)\include&quot;"
AdditionalIncludeDirectories="&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;;&quot;$(PYTHONDIR)\include&quot;;&quot;$(NUMPYDIR)&quot;"
PreprocessorDefinitions="__STF__;STFDLL;_WIN64;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_LAPACK;WXUSINGDLL;__WXMSW__;WXP_USE_THREAD=1;WITH_PYTHON;WITH_BIOSIG2"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -281,7 +281,7 @@
Optimization="3"
EnableIntrinsicFunctions="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;;&quot;$(PYTHONDIR)\include&quot;"
AdditionalIncludeDirectories="&quot;$(BOOSTDIR)&quot;;&quot;$(WXDIR)\include&quot;;&quot;$(WXDIR)\lib\vc90_x64_dll\mswu&quot;;&quot;$(FFTWDIR)&quot;;&quot;$(PYTHONDIR)\include&quot;;&quot;$(NUMPYDIR)&quot;"
PreprocessorDefinitions="__STF__;STFDLL;_WIN64;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_LAPACK;WXUSINGDLL;__WXMSW__;WXP_USE_THREAD=1;WITH_PYTHON;WITH_BIOSIG2"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
......
......@@ -17,18 +17,18 @@ SetCompressor lzma
!define WXW_VERSION "3.0.2.0"
!define WXW_VERSION_DIR "3.0.2"
!define WXW_VERSION_SHORT "30"
!define PY_VERSION "2.7.9"
!define PY_VERSION "2.7.13"
!define PY_MAJOR "2.7"
!define PY_MAJOR_SHORT "27"
!define PY_MIN "2.7"
!define PY_INST_FILE "python-${PY_VERSION}.amd64.msi"
Var PY_ACT
!define NP_VERSION "1.9.3"
!define MPL_VERSION "1.5.0"
!define NP_VERSION ""
!define MPL_VERSION ""
!define EMF_VERSION "2.0.0"
!define EXE_NAME "Stimfit"
!define REG_NAME "Stimfit 0.14"
!define REG_NAME_IO "stfio 0.14"
!define REG_NAME "Stimfit 0.15"
!define REG_NAME_IO "stfio 0.15"
!define PRODUCT_PUBLISHER "Christoph Schmidt-Hieber"
!define PRODUCT_WEB_SITE "http://www.stimfit.org"
!define STFDIR "..\..\..\..\stimfit"
......
......@@ -239,7 +239,8 @@ std::vector<std::vector<float> > read_aux_data(BinaryReader& binreader, uint16_t
void stfio::importIntanFile(const std::string &fName, Recording &ReturnData, ProgressInfo& progDlg) {
unique_ptr<FileInStream> fs(new FileInStream());
fs->open(fName);
std::wstring wfName(fName.begin(), fName.end());
fs->open(wfName);
unique_ptr<BinaryReader> binreader(new BinaryReader(move(fs)));
......
......@@ -31,6 +31,8 @@ Example:
>>> intan_file = intan.IntanFile('myexperiment_AUX_160916_142731.clp')
>>> plt.plot(intan_file.data["Time"], intan_file.data["ADC"][1])
*/
#ifndef INTANLIB_H
#define INTANLIB_H
#if __cplusplus > 199711L
#include <cstdint>
......@@ -40,6 +42,17 @@ Example:
#include "./../stfio.h"
#ifdef _WINDOWS
typedef __int8 int8_t;
typedef __int16 int16_t;
typedef __int32 int32_t;
typedef __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#endif
class Recording;
static const int MAX_REGISTERS = 14;
......@@ -128,3 +141,4 @@ namespace stfio {
void importIntanFile(const std::string &fName, Recording &ReturnData, ProgressInfo& progDlg);
}
#endif
\ No newline at end of file
......@@ -184,10 +184,17 @@ BinaryReader& operator>>(BinaryReader& istream, wstring& value) {
value.clear();
if (size > 0) {
vector<char> tmp(size + 2);
#ifndef _WINDOWS
istream.other->read(tmp.data(), size);
tmp[size] = 0;
tmp[size + 1] = 0;
value = reinterpret_cast<wchar_t*>(tmp.data());
#else
istream.other->read(&tmp[0], size);
tmp[size] = 0;
tmp[size + 1] = 0;
value = reinterpret_cast<wchar_t*>(&tmp[0]);
#endif
}
return istream;
}
......
......@@ -43,6 +43,7 @@ using boost::move;
#include <iosfwd>
#include <istream>
#include "./intanlib.h"
#if defined(_WIN32) && defined(_UNICODE)
typedef std::wstring FILENAME;
......
......@@ -62,11 +62,10 @@ void Recording::init() {
cs = 0;
selectedSections = std::vector<std::size_t>(0);
selectBase = Vector_double(0);
sectionMarker = NULL;
sectionMarker = std::vector<int>(0);
}
Recording::~Recording() {
if (sectionMarker) free(sectionMarker);
}
const Channel& Recording::at(std::size_t n_c) const {
......@@ -388,12 +387,12 @@ std::string Recording::GetEventDescription(int type) {
return listOfMarkers[type];
}
std::string Recording::SetEventDescription(int type, const char* Description) {
void Recording::SetEventDescription(int type, const char* Description) {
listOfMarkers[type] = Description;
}
void Recording::InitSectionMarkerList(size_t n) {
sectionMarker=(typeof(sectionMarker))calloc(n,sizeof(*sectionMarker));
sectionMarker.resize(n);
return;
}
......
......@@ -371,7 +371,7 @@ class StfioDll Recording {
std::string GetEventDescription(int type);
//! Set Description of Event Type
std::string SetEventDescription(int type, const char* Description);
void SetEventDescription(int type, const char* Description);
//! Initialize List of Section Markers
void InitSectionMarkerList(size_t n);
......@@ -418,7 +418,7 @@ class StfioDll Recording {
as defined event table.
currently only one event type per segment is supported.
*/
int* sectionMarker=NULL;
std::vector<int> sectionMarker;
void init();
......
......@@ -212,6 +212,10 @@ bool wxStfApp::OnInit(void)
wxT("HEKA file"), wxT("*.dat"), wxT(""), wxT("dat"),
wxT("HEKA Document"), wxT("HEKA View"), CLASSINFO(wxStfDoc),
CLASSINFO(wxStfView) );
m_intanTemplate=new wxDocTemplate( docManager,
wxT("Intan CLAMP file"), wxT("*.clp"), wxT(""), wxT("clp"),
wxT("Intan CLAMP Document"), wxT("Intan View"), CLASSINFO(wxStfDoc),
CLASSINFO(wxStfView) );
#if 0
m_sonTemplate=new wxDocTemplate( docManager,
wxT("CED Spike 2 (SON) file"), wxT("*.smr"), wxT(""), wxT(""),
......
......@@ -526,7 +526,7 @@ private:
// Pointer to the cursors settings dialog box
wxStfCursorsDlg* CursorsDialog;
wxDocTemplate* m_cfsTemplate, *m_hdf5Template, *m_txtTemplate,*m_abfTemplate,
*m_atfTemplate,*m_axgTemplate,*m_sonTemplate, *m_hekaTemplate, *m_biosigTemplate;
*m_atfTemplate,*m_axgTemplate,*m_sonTemplate, *m_hekaTemplate, *m_intanTemplate, *m_biosigTemplate;
stfnum::storedFunc storedLinFunc;
// wxMenu* m_file_menu;
wxString m_fileToLoad;
......
......@@ -24,9 +24,11 @@
#ifndef _STF_H_
#define _STF_H_
#ifndef _WINDOWS
#if (__cplusplus < 201103)
#include <boost/function.hpp>
#endif
#endif
#include <vector>
#include <map>
#include <string>
......
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